From: Johan D. <jd...@pd...> - 2004-02-25 12:14:27
|
CVS Root: /cvs/gstreamer Module: gst-python Changes by: jdahlin Date: Wed Feb 25 2004 04:13:10 PST Log message: * gstreamer/gstreamer.override: * gstreamer/gstreamermodule.c: Rename some more things to gst * gstreamer/arg-types.py: Clean up and add GstData handling * gstreamer/gstreamer.defs: * gstreamer/gst-types.defs: Split out types to a separate defs * gstreamer/gst-types.c: New file to handle custom GstData conversions. Modified files: . : ChangeLog examples/gstreamer: identity.py gstreamer : Makefile.am arg-types.py gstreamer.defs gstreamermodule.c Added files: gstreamer : gst-types.c gst-types.defs Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/ChangeLog.diff?r1=1.54&r2=1.55 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/examples/gstreamer/identity.py.diff?r1=1.5&r2=1.6 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/Makefile.am.diff?r1=1.15&r2=1.16 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/arg-types.py.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/gst-types.c?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/gst-types.defs?rev=1.1&content-type=text/vnd.viewcvs-markup http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/gstreamer.defs.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gstreamer/gstreamermodule.c.diff?r1=1.5&r2=1.6 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-python/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- a/ChangeLog 24 Feb 2004 18:52:30 -0000 1.54 +++ b/ChangeLog 25 Feb 2004 12:12:57 -0000 1.55 @@ -1,3 +1,15 @@ +2004-02-25 Johan Dahlin <jo...@gn...> + + * gstreamer/gstreamer.override: + * gstreamer/gstreamermodule.c: Rename some more things to gst + * gstreamer/arg-types.py: Clean up and add GstData handling + * gstreamer/gstreamer.defs: + * gstreamer/gst-types.defs: Split out types to a separate defs + * gstreamer/gst-types.c: New file to handle custom GstData conversions. 2004-02-24 David I. Lehn <dl...@us...> * gstreamer/0.7.override: Index: identity.py RCS file: /cvs/gstreamer/gst-python/examples/gstreamer/identity.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- a/identity.py 24 Feb 2004 18:40:20 -0000 1.5 +++ b/identity.py 25 Feb 2004 12:12:57 -0000 1.6 @@ -47,6 +47,7 @@ def chain(self, pad, buf): self.srcpad.push(buf) + gobject.type_register(Identity) def filter(element): Index: Makefile.am RCS file: /cvs/gstreamer/gst-python/gstreamer/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- a/Makefile.am 23 Feb 2004 20:24:53 -0000 1.15 +++ b/Makefile.am 25 Feb 2004 12:12:58 -0000 1.16 @@ -37,7 +37,9 @@ pygstexec_LTLIBRARIES = _gstmodule.la _gstmodule_la_SOURCES = \ gstreamermodule.c \ - common.c common.h \ + gst-types.c \ + common.c \ + common.h \ $(VERSOURCES) _gstmodule_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing _gstmodule_la_LIBADD = $(GST_LIBS) @@ -55,10 +57,8 @@ gstreamer.c: $(srcdir)/$(MODULE).defs $(srcdir)/arg-types.py $(srcdir)/$(MODULE).override $(PYGTK_CODEGEN) \ --load-types $(srcdir)/arg-types.py \ + --register $(srcdir)/gst-types.defs \ --override $(srcdir)/$(MODULE).override \ - --prefix py$(MODULE) $(MODULE).defs > gen-$(MODULE).c \ + --prefix pygst $(MODULE).defs > gen-$(MODULE).c \ && cp gen-$(MODULE).c $(MODULE).c \ && rm -f gen-$(MODULE).c - -# --register $(PYGTK_DEFSDIR)/gtk-types.defs -# --register $(top_srcdir)/blah/blah-types.defs Index: arg-types.py RCS file: /cvs/gstreamer/gst-python/gstreamer/arg-types.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- a/arg-types.py 10 Oct 2003 04:21:21 -0000 1.1 +++ b/arg-types.py 25 Feb 2004 12:12:58 -0000 1.2 @@ -1,6 +1,7 @@ # # gst-python # Copyright (C) 2002 David I. Lehn +# 2004 Johan Dahlin # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -20,13 +21,38 @@ # Author: David I. Lehn <dl...@us...> -import argtypes +from argtypes import UInt64Arg, Int64Arg, PointerArg, ArgMatcher, ArgType, matcher -arg = argtypes.UInt64Arg() -argtypes.matcher.register('GstClockTime', arg) +class GstDataPtrArg(ArgType): + normal = (' if (!pygst_data_from_pyobject(py_%(name)s, &%(name)s))\n' + ' return NULL;\n') + null = (' if (py_%(name)s == Py_None)\n' + ' %(name)s = NULL;\n' + ' else if (pyst_data_from_pyobject(py_%(name)s, &%(name)s_rect))\n' + ' %(name)s = &%(name)s_rect;\n' + ' else\n' + ' return NULL;\n') + def write_param(self, ptype, pname, pdflt, pnull, info): + if pnull: + info.varlist.add('GstData', pname + '_data') + info.varlist.add('GstData', '*' + pname) + info.varlist.add('PyObject', '*py_' + pname + ' = Py_None') + info.add_parselist('O', ['&py_' + pname], [pname]) + info.arglist.append(pname) + info.codebefore.append(self.null % {'name': pname}) + else: + info.varlist.add('GstData', pname) + info.varlist.add('PyObject', '*py_' + pname) + info.arglist.append('&' + pname) + info.codebefore.append(self.normal % {'name': pname}) -arg = argtypes.Int64Arg() -argtypes.matcher.register('GstClockTimeDiff', arg) +arg = GstDataPtrArg() +matcher.register('GstData*', arg) +matcher.register('GstClockTime', UInt64Arg()) +matcher.register('GstClockTimeDiff', Int64Arg()) -arg = argtypes.PointerArg('gpointer', 'G_TYPE_POINTER') -argtypes.matcher.register('GstClockID', arg) +arg = PointerArg('gpointer', 'G_TYPE_POINTER') +matcher.register('GstClockID', arg) +del arg --- NEW FILE: gst-types.c --- /* gst-python * Copyright (C) 2004 Johan Dahlin * * 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. * * Author: Johan Dahlin <jo...@gn...> */ #include <gst/gst.h> #include <pygobject.h> gboolean pygst_data_from_pyobject(PyObject *object, GstData **data) { g_return_val_if_fail(*data != NULL, FALSE); if (pyg_boxed_check(object, GST_TYPE_DATA)) { *data = pyg_boxed_get(object, GstData); return TRUE; } else if (pyg_boxed_check(object, GST_TYPE_BUFFER)) { *data = GST_DATA (pyg_boxed_get(object, GstBuffer)); } else if (pyg_boxed_check(object, GST_TYPE_EVENT)) { *data = GST_DATA (pyg_boxed_get(object, GstEvent)); } PyErr_Clear(); PyErr_SetString(PyExc_TypeError, "could not convert to GstData"); return FALSE; } static PyObject * PyGstData_from_value(const GValue *value) GstData *data = (GstData *)g_value_get_boxed(value); return pyg_boxed_new(GST_TYPE_DATA, data, TRUE, TRUE); static int PyGstData_to_value(GValue *value, PyObject *object) GstData* data; if (!pygst_data_from_pyobject(object, &data)) return -1; g_value_set_boxed(value, &data); return 0; /* We have to set ob_type here because stupid win32 does not allow you * to use variables from another dll in a global variable initialisation. void _pygst_register_boxed_types(PyObject *moddict) pyg_register_boxed_custom(GST_TYPE_DATA, PyGstData_from_value, PyGstData_to_value); --- NEW FILE: gst-types.defs --- ;; -*- scheme -*- ; object definitions ... (define-object Object (in-module "Gst") (parent "GObject") (c-name "GstObject") (gtype-id "GST_TYPE_OBJECT") ) (define-object Index (parent "GstObject") (c-name "GstIndex") (gtype-id "GST_TYPE_INDEX") (define-object Element (c-name "GstElement") (gtype-id "GST_TYPE_ELEMENT") (define-object Bin (parent "GstElement") (c-name "GstBin") (gtype-id "GST_TYPE_BIN") (define-object Clock (c-name "GstClock") (gtype-id "GST_TYPE_CLOCK") (define-object Pad (c-name "GstPad") (gtype-id "GST_TYPE_PAD") (define-object GhostPad (parent "GstPad") (c-name "GstGhostPad") (gtype-id "GST_TYPE_GHOST_PAD") (define-object PadTemplate (c-name "GstPadTemplate") (gtype-id "GST_TYPE_PAD_TEMPLATE") (define-object Pipeline (parent "GstBin") (c-name "GstPipeline") (gtype-id "GST_TYPE_PIPELINE") (define-object PluginFeature (c-name "GstPluginFeature") (gtype-id "GST_TYPE_PLUGIN_FEATURE") (define-object IndexFactory (parent "GstPluginFeature") (c-name "GstIndexFactory") (gtype-id "GST_TYPE_INDEX_FACTORY") (define-object ElementFactory (c-name "GstElementFactory") (gtype-id "GST_TYPE_ELEMENT_FACTORY") (define-object Queue (c-name "GstQueue") (gtype-id "GST_TYPE_QUEUE") (define-object RealPad (c-name "GstRealPad") (gtype-id "GST_TYPE_REAL_PAD") (define-object Registry (c-name "GstRegistry") (gtype-id "GST_TYPE_REGISTRY") (define-object Scheduler (c-name "GstScheduler") (gtype-id "GST_TYPE_SCHEDULER") (define-object SchedulerFactory (c-name "GstSchedulerFactory") (gtype-id "GST_TYPE_SCHEDULER_FACTORY") (define-object SystemClock (parent "GstClock") (c-name "GstSystemClock") (gtype-id "GST_TYPE_SYSTEM_CLOCK") (define-object Thread (c-name "GstThread") (gtype-id "GST_TYPE_THREAD") (define-object TypeFindFactory (c-name "GstTypeFindFactory") (gtype-id "GST_TYPE_TYPE_FIND_FACTORY") (define-object XML (c-name "GstXML") (gtype-id "GST_TYPE_XML") ;; ;; Boxed types (define-boxed Buffer (c-name "GstBuffer") (gtype-id "GST_TYPE_BUFFER") (copy-func "gst_buffer_copy") (release-func "gst_buffer_free") (define-boxed Caps (c-name "GstCaps") (gtype-id "GST_TYPE_CAPS") ;(define-boxed Data ; (in-module "Gst") ; (c-name "GstData") ; (gtype-id "GST_TYPE_DATA") ; (copy-func "gst_data_copy") ; (release-func "gst_data_free") ;) (define-boxed Event (c-name "GstEvent") (gtype-id "GST_TYPE_EVENT") (copy-func "gst_event_copy") (release-func "gst_event_free") ;; 0.7 Boxed types (define-boxed Structure (c-name "GstStructure") (gtype-id "GST_TYPE_STRUCTURE") (define-boxed TagList (c-name "GstTagList") (gtype-id "GST_TYPE_TAG_LIST") ;; Enumerations and flags ... (define-enum BinFlags (c-name "GstBinFlags") (gtype-id "GST_TYPE_BIN_FLAGS") (values '("flag-manager" "GST_BIN_FLAG_MANAGER") '("self-schedulable" "GST_BIN_SELF_SCHEDULABLE") '("flag-prefer-cothreads" "GST_BIN_FLAG_PREFER_COTHREADS") '("flag-fixed-clock" "GST_BIN_FLAG_FIXED_CLOCK") '("flag-last" "GST_BIN_FLAG_LAST") ) (define-enum BufferFlag (c-name "GstBufferFlag") (gtype-id "GST_TYPE_BUFFER_FLAG") '("readonly" "GST_BUFFER_READONLY") '("subbuffer" "GST_BUFFER_SUBBUFFER") '("original" "GST_BUFFER_ORIGINAL") '("dontfree" "GST_BUFFER_DONTFREE") '("key-unit" "GST_BUFFER_KEY_UNIT") '("dontkeep" "GST_BUFFER_DONTKEEP") '("flag-last" "GST_BUFFER_FLAG_LAST") (define-enum ClockEntryStatus (c-name "GstClockEntryStatus") (gtype-id "GST_TYPE_CLOCK_ENTRY_STATUS") '("ok" "GST_CLOCK_ENTRY_OK") '("early" "GST_CLOCK_ENTRY_EARLY") '("restart" "GST_CLOCK_ENTRY_RESTART") (define-enum ClockEntryType (c-name "GstClockEntryType") (gtype-id "GST_TYPE_CLOCK_ENTRY_TYPE") '("single" "GST_CLOCK_ENTRY_SINGLE") '("periodic" "GST_CLOCK_ENTRY_PERIODIC") (define-enum ClockReturn (c-name "GstClockReturn") (gtype-id "GST_TYPE_CLOCK_RETURN") '("stopped" "GST_CLOCK_STOPPED") '("timeout" "GST_CLOCK_TIMEOUT") '("early" "GST_CLOCK_EARLY") '("error" "GST_CLOCK_ERROR") '("unsupported" "GST_CLOCK_UNSUPPORTED") (define-flags ClockFlags (c-name "GstClockFlags") (gtype-id "GST_TYPE_CLOCK_FLAGS") '("do-single-sync" "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC") '("do-single-async" "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC") '("do-periodic-sync" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC") '("do-periodic-async" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC") '("set-resolution" "GST_CLOCK_FLAG_CAN_SET_RESOLUTION") '("set-speed" "GST_CLOCK_FLAG_CAN_SET_SPEED") (define-flags CPUFlags (c-name "GstCPUFlags") (gtype-id "GST_TYPE_CPU_FLAGS") '("mmx" "GST_CPU_FLAG_MMX") '("sse" "GST_CPU_FLAG_SSE") '("mmxext" "GST_CPU_FLAG_MMXEXT") '("3dnow" "GST_CPU_FLAG_3DNOW") (define-enum DataFlags (c-name "GstDataFlags") (gtype-id "GST_TYPE_DATA_FLAGS") '("readonly" "GST_DATA_READONLY") '("flag-last" "GST_DATA_FLAG_LAST") (define-enum ElementFlags (c-name "GstElementFlags") (gtype-id "GST_TYPE_ELEMENT_FLAGS") '("complex" "GST_ELEMENT_COMPLEX") '("decoupled" "GST_ELEMENT_DECOUPLED") '("thread-suggested" "GST_ELEMENT_THREAD_SUGGESTED") '("infinite-loop" "GST_ELEMENT_INFINITE_LOOP") '("new-loopfunc" "GST_ELEMENT_NEW_LOOPFUNC") '("event-aware" "GST_ELEMENT_EVENT_AWARE") '("use-threadsafe-properties" "GST_ELEMENT_USE_THREADSAFE_PROPERTIES") '("scheduler-private1" "GST_ELEMENT_SCHEDULER_PRIVATE1") '("scheduler-private2" "GST_ELEMENT_SCHEDULER_PRIVATE2") '("locked-state" "GST_ELEMENT_LOCKED_STATE") '("in-error" "GST_ELEMENT_IN_ERROR") '("flag-last" "GST_ELEMENT_FLAG_LAST") (define-enum CoreError (c-name "GstCoreError") (gtype-id "GST_TYPE_CORE_ERROR") '("failed" "GST_CORE_ERROR_FAILED") '("too-lazy" "GST_CORE_ERROR_TOO_LAZY") '("not-implemented" "GST_CORE_ERROR_NOT_IMPLEMENTED") '("state-change" "GST_CORE_ERROR_STATE_CHANGE") '("pad" "GST_CORE_ERROR_PAD") '("thread" "GST_CORE_ERROR_THREAD") '("scheduler" "GST_CORE_ERROR_SCHEDULER") '("negotiation" "GST_CORE_ERROR_NEGOTIATION") '("event" "GST_CORE_ERROR_EVENT") '("seek" "GST_CORE_ERROR_SEEK") '("caps" "GST_CORE_ERROR_CAPS") '("tag" "GST_CORE_ERROR_TAG") '("num-errors" "GST_CORE_ERROR_NUM_ERRORS") (define-enum LibraryError (c-name "GstLibraryError") (gtype-id "GST_TYPE_LIBRARY_ERROR") '("failed" "GST_LIBRARY_ERROR_FAILED") '("too-lazy" "GST_LIBRARY_ERROR_TOO_LAZY") '("init" "GST_LIBRARY_ERROR_INIT") '("shutdown" "GST_LIBRARY_ERROR_SHUTDOWN") '("settings" "GST_LIBRARY_ERROR_SETTINGS") '("encode" "GST_LIBRARY_ERROR_ENCODE") '("num-errors" "GST_LIBRARY_ERROR_NUM_ERRORS") (define-enum ResourceError (c-name "GstResourceError") (gtype-id "GST_TYPE_RESOURCE_ERROR") '("failed" "GST_RESOURCE_ERROR_FAILED") '("too-lazy" "GST_RESOURCE_ERROR_TOO_LAZY") '("not-found" "GST_RESOURCE_ERROR_NOT_FOUND") '("busy" "GST_RESOURCE_ERROR_BUSY") '("open-read" "GST_RESOURCE_ERROR_OPEN_READ") '("open-write" "GST_RESOURCE_ERROR_OPEN_WRITE") '("open-read-write" "GST_RESOURCE_ERROR_OPEN_READ_WRITE") '("close" "GST_RESOURCE_ERROR_CLOSE") '("read" "GST_RESOURCE_ERROR_READ") '("write" "GST_RESOURCE_ERROR_WRITE") '("seek" "GST_RESOURCE_ERROR_SEEK") '("sync" "GST_RESOURCE_ERROR_SYNC") '("settings" "GST_RESOURCE_ERROR_SETTINGS") '("num-errors" "GST_RESOURCE_ERROR_NUM_ERRORS") (define-enum StreamError (c-name "GstStreamError") (gtype-id "GST_TYPE_STREAM_ERROR") '("failed" "GST_STREAM_ERROR_FAILED") '("too-lazy" "GST_STREAM_ERROR_TOO_LAZY") '("not-implemented" "GST_STREAM_ERROR_NOT_IMPLEMENTED") '("type-not-found" "GST_STREAM_ERROR_TYPE_NOT_FOUND") '("wrong-type" "GST_STREAM_ERROR_WRONG_TYPE") '("codec-not-found" "GST_STREAM_ERROR_CODEC_NOT_FOUND") '("decode" "GST_STREAM_ERROR_DECODE") '("encode" "GST_STREAM_ERROR_ENCODE") '("demux" "GST_STREAM_ERROR_DEMUX") '("mux" "GST_STREAM_ERROR_MUX") '("format" "GST_STREAM_ERROR_FORMAT") '("num-errors" "GST_STREAM_ERROR_NUM_ERRORS") (define-enum EventType (c-name "GstEventType") (gtype-id "GST_TYPE_EVENT_TYPE") '("unknown" "GST_EVENT_UNKNOWN") '("eos" "GST_EVENT_EOS") '("flush" "GST_EVENT_FLUSH") '("empty" "GST_EVENT_EMPTY") '("discontinuous" "GST_EVENT_DISCONTINUOUS") '("qos" "GST_EVENT_QOS") '("seek" "GST_EVENT_SEEK") '("seek-segment" "GST_EVENT_SEEK_SEGMENT") '("segment-done" "GST_EVENT_SEGMENT_DONE") '("size" "GST_EVENT_SIZE") '("rate" "GST_EVENT_RATE") '("filler" "GST_EVENT_FILLER") '("ts-offset" "GST_EVENT_TS_OFFSET") '("interrupt" "GST_EVENT_INTERRUPT") '("navigation" "GST_EVENT_NAVIGATION") '("tag" "GST_EVENT_TAG") (define-flags EventFlag (c-name "GstEventFlag") (gtype-id "GST_TYPE_EVENT_FLAG") '("event-flag-none" "GST_EVENT_FLAG_NONE") '("rate-flag-negative" "GST_RATE_FLAG_NEGATIVE") (define-flags SeekType (c-name "GstSeekType") (gtype-id "GST_TYPE_SEEK_TYPE") '("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") (define-enum SeekAccuracy (c-name "GstSeekAccuracy") (gtype-id "GST_TYPE_SEEK_ACCURACY") '("certain" "GST_SEEK_CERTAIN") '("fuzzy" "GST_SEEK_FUZZY") (define-enum Format (c-name "GstFormat") (gtype-id "GST_TYPE_FORMAT") '("undefined" "GST_FORMAT_UNDEFINED") '("default" "GST_FORMAT_DEFAULT") '("bytes" "GST_FORMAT_BYTES") '("time" "GST_FORMAT_TIME") '("buffers" "GST_FORMAT_BUFFERS") '("percent" "GST_FORMAT_PERCENT") (define-enum IndexCertainty (c-name "GstIndexCertainty") (gtype-id "GST_TYPE_INDEX_CERTAINTY") '("unknown" "GST_INDEX_UNKNOWN") '("certain" "GST_INDEX_CERTAIN") '("fuzzy" "GST_INDEX_FUZZY") (define-enum IndexEntryType (c-name "GstIndexEntryType") (gtype-id "GST_TYPE_INDEX_ENTRY_TYPE") '("id" "GST_INDEX_ENTRY_ID") '("association" "GST_INDEX_ENTRY_ASSOCIATION") '("object" "GST_INDEX_ENTRY_OBJECT") '("format" "GST_INDEX_ENTRY_FORMAT") (define-enum IndexLookupMethod (c-name "GstIndexLookupMethod") (gtype-id "GST_TYPE_INDEX_LOOKUP_METHOD") '("exact" "GST_INDEX_LOOKUP_EXACT") '("before" "GST_INDEX_LOOKUP_BEFORE") '("after" "GST_INDEX_LOOKUP_AFTER") (define-flags AssocFlags (c-name "GstAssocFlags") (gtype-id "GST_TYPE_ASSOC_FLAGS") '("none" "GST_ASSOCIATION_FLAG_NONE") '("key-unit" "GST_ASSOCIATION_FLAG_KEY_UNIT") '("last" "GST_ASSOCIATION_FLAG_LAST") (define-enum IndexResolverMethod (c-name "GstIndexResolverMethod") (gtype-id "GST_TYPE_INDEX_RESOLVER_METHOD") '("custom" "GST_INDEX_RESOLVER_CUSTOM") '("gtype" "GST_INDEX_RESOLVER_GTYPE") '("path" "GST_INDEX_RESOLVER_PATH") (define-enum IndexFlags (c-name "GstIndexFlags") (gtype-id "GST_TYPE_INDEX_FLAGS") '("writable" "GST_INDEX_WRITABLE") '("readable" "GST_INDEX_READABLE") '("flag-last" "GST_INDEX_FLAG_LAST") (define-enum DebugLevel (c-name "GstDebugLevel") (gtype-id "GST_TYPE_DEBUG_LEVEL") '("none" "GST_LEVEL_NONE") '("error" "GST_LEVEL_ERROR") '("warning" "GST_LEVEL_WARNING") '("info" "GST_LEVEL_INFO") '("debug" "GST_LEVEL_DEBUG") '("log" "GST_LEVEL_LOG") '("count" "GST_LEVEL_COUNT") (define-enum DebugColorFlags (c-name "GstDebugColorFlags") (gtype-id "GST_TYPE_DEBUG_COLOR_FLAGS") '("fg-black" "GST_DEBUG_FG_BLACK") '("fg-red" "GST_DEBUG_FG_RED") '("fg-green" "GST_DEBUG_FG_GREEN") '("fg-yellow" "GST_DEBUG_FG_YELLOW") '("fg-blue" "GST_DEBUG_FG_BLUE") '("fg-magenta" "GST_DEBUG_FG_MAGENTA") '("fg-cyan" "GST_DEBUG_FG_CYAN") '("fg-white" "GST_DEBUG_FG_WHITE") '("bg-black" "GST_DEBUG_BG_BLACK") '("bg-red" "GST_DEBUG_BG_RED") '("bg-green" "GST_DEBUG_BG_GREEN") '("bg-yellow" "GST_DEBUG_BG_YELLOW") '("bg-blue" "GST_DEBUG_BG_BLUE") '("bg-magenta" "GST_DEBUG_BG_MAGENTA") '("bg-cyan" "GST_DEBUG_BG_CYAN") '("bg-white" "GST_DEBUG_BG_WHITE") '("bold" "GST_DEBUG_BOLD") '("underline" "GST_DEBUG_UNDERLINE") (define-enum ObjectFlags (c-name "GstObjectFlags") (gtype-id "GST_TYPE_OBJECT_FLAGS") '("destroyed" "GST_DESTROYED") '("floating" "GST_FLOATING") '("object-flag-last" "GST_OBJECT_FLAG_LAST") (define-enum PadLinkReturn (c-name "GstPadLinkReturn") (gtype-id "GST_TYPE_PAD_LINK_RETURN") '("refused" "GST_PAD_LINK_REFUSED") '("delayed" "GST_PAD_LINK_DELAYED") '("ok" "GST_PAD_LINK_OK") '("done" "GST_PAD_LINK_DONE") (define-enum PadDirection (c-name "GstPadDirection") (gtype-id "GST_TYPE_PAD_DIRECTION") '("unknown" "GST_PAD_UNKNOWN") '("src" "GST_PAD_SRC") '("sink" "GST_PAD_SINK") (define-enum PadFlags (c-name "GstPadFlags") (gtype-id "GST_TYPE_PAD_FLAGS") '("disabled" "GST_PAD_DISABLED") '("negotiating" "GST_PAD_NEGOTIATING") '("flag-last" "GST_PAD_FLAG_LAST") (define-enum PadPresence (c-name "GstPadPresence") (gtype-id "GST_TYPE_PAD_PRESENCE") '("always" "GST_PAD_ALWAYS") '("sometimes" "GST_PAD_SOMETIMES") '("request" "GST_PAD_REQUEST") (define-enum PadTemplateFlags (c-name "GstPadTemplateFlags") (gtype-id "GST_TYPE_PAD_TEMPLATE_FLAGS") '("ixed" "GST_PAD_TEMPLATE_FIXED") '("lag-last" "GST_PAD_TEMPLATE_FLAG_LAST") (define-enum ParseError (c-name "GstParseError") (gtype-id "GST_TYPE_PARSE_ERROR") '("syntax" "GST_PARSE_ERROR_SYNTAX") '("no-such-element" "GST_PARSE_ERROR_NO_SUCH_ELEMENT") '("no-such-property" "GST_PARSE_ERROR_NO_SUCH_PROPERTY") '("link" "GST_PARSE_ERROR_LINK") '("could-not-set-property" "GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY") '("empty-bin" "GST_PARSE_ERROR_EMPTY_BIN") '("empty" "GST_PARSE_ERROR_EMPTY") (define-enum PluginError (c-name "GstPluginError") (gtype-id "GST_TYPE_PLUGIN_ERROR") '("module" "GST_PLUGIN_ERROR_MODULE") '("dependencies" "GST_PLUGIN_ERROR_DEPENDENCIES") '("name-mismatch" "GST_PLUGIN_ERROR_NAME_MISMATCH") (define-enum QueryType (c-name "GstQueryType") (gtype-id "GST_TYPE_QUERY_TYPE") '("none" "GST_QUERY_NONE") '("total" "GST_QUERY_TOTAL") '("position" "GST_QUERY_POSITION") '("latency" "GST_QUERY_LATENCY") '("jitter" "GST_QUERY_JITTER") '("start" "GST_QUERY_START") '("segment-end" "GST_QUERY_SEGMENT_END") '("rate" "GST_QUERY_RATE") (define-flags RegistryReturn (c-name "GstRegistryReturn") (gtype-id "GST_TYPE_REGISTRY_RETURN") '("ok" "GST_REGISTRY_OK") '("load-error" "GST_REGISTRY_LOAD_ERROR") '("save-error" "GST_REGISTRY_SAVE_ERROR") '("plugin-load-error" "GST_REGISTRY_PLUGIN_LOAD_ERROR") '("plugin-signature-error" "GST_REGISTRY_PLUGIN_SIGNATURE_ERROR") (define-flags RegistryFlags (c-name "GstRegistryFlags") (gtype-id "GST_TYPE_REGISTRY_FLAGS") '("readable" "GST_REGISTRY_READABLE") '("writable" "GST_REGISTRY_WRITABLE") '("exists" "GST_REGISTRY_EXISTS") '("remote" "GST_REGISTRY_REMOTE") '("delayed-loading" "GST_REGISTRY_DELAYED_LOADING") (define-enum SchedulerFlags (c-name "GstSchedulerFlags") (gtype-id "GST_TYPE_SCHEDULER_FLAGS") '("fixed-clock" "GST_SCHEDULER_FLAG_FIXED_CLOCK") '("last" "GST_SCHEDULER_FLAG_LAST") (define-enum SchedulerState (c-name "GstSchedulerState") (gtype-id "GST_TYPE_SCHEDULER_STATE") '("none" "GST_SCHEDULER_STATE_NONE") '("running" "GST_SCHEDULER_STATE_RUNNING") '("stopped" "GST_SCHEDULER_STATE_STOPPED") '("error" "GST_SCHEDULER_STATE_ERROR") (define-enum TagMergeMode (c-name "GstTagMergeMode") (gtype-id "GST_TYPE_TAG_MERGE_MODE") '("undefined" "GST_TAG_MERGE_UNDEFINED") '("replace-all" "GST_TAG_MERGE_REPLACE_ALL") '("replace" "GST_TAG_MERGE_REPLACE") '("append" "GST_TAG_MERGE_APPEND") '("prepend" "GST_TAG_MERGE_PREPEND") '("keep" "GST_TAG_MERGE_KEEP") '("keep-all" "GST_TAG_MERGE_KEEP_ALL") '("count" "GST_TAG_MERGE_COUNT") (define-enum TagFlag (c-name "GstTagFlag") (gtype-id "GST_TYPE_TAG_FLAG") '("undefined" "GST_TAG_FLAG_UNDEFINED") '("meta" "GST_TAG_FLAG_META") '("encoded" "GST_TAG_FLAG_ENCODED") '("decoded" "GST_TAG_FLAG_DECODED") '("count" "GST_TAG_FLAG_COUNT") (define-enum ThreadState (c-name "GstThreadState") (gtype-id "GST_TYPE_THREAD_STATE") '("state-spinning" "GST_THREAD_STATE_SPINNING") '("state-reaping" "GST_THREAD_STATE_REAPING") '("mutex-locked" "GST_THREAD_MUTEX_LOCKED") '("flag-last" "GST_THREAD_FLAG_LAST") (define-flags AllocTraceFlags (c-name "GstAllocTraceFlags") (gtype-id "GST_TYPE_ALLOC_TRACE_FLAGS") '("live" "GST_ALLOC_TRACE_LIVE") '("mem-live" "GST_ALLOC_TRACE_MEM_LIVE") (define-enum TypeFindProbability (c-name "GstTypeFindProbability") (gtype-id "GST_TYPE_TYPE_FIND_PROBABILITY") '("minimum" "GST_TYPE_FIND_MINIMUM") '("possible" "GST_TYPE_FIND_POSSIBLE") '("likely" "GST_TYPE_FIND_LIKELY") '("nearly-certain" "GST_TYPE_FIND_NEARLY_CERTAIN") '("maximum" "GST_TYPE_FIND_MAXIMUM") (define-flags ElementState (c-name "GstElementState") (gtype-id "GST_TYPE_ELEMENT_STATE") '("void-pending" "GST_STATE_VOID_PENDING") '("null" "GST_STATE_NULL") '("ready" "GST_STATE_READY") '("paused" "GST_STATE_PAUSED") '("playing" "GST_STATE_PLAYING") (define-enum ElementStateReturn (c-name "GstElementStateReturn") (gtype-id "GST_TYPE_ELEMENT_STATE_RETURN") '("failure" "GST_STATE_FAILURE") '("success" "GST_STATE_SUCCESS") '("async" "GST_STATE_ASYNC") (define-enum Result (c-name "GstResult") (gtype-id "GST_TYPE_RESULT") '("ok" "GST_RESULT_OK") '("nok" "GST_RESULT_NOK") '("not-impl" "GST_RESULT_NOT_IMPL") (define-enum URIType (c-name "GstURIType") (gtype-id "GST_TYPE_URI_TYPE") '("unknown" "GST_URI_UNKNOWN") '("sink" "GST_URI_SINK") '("src" "GST_URI_SRC") Index: gstreamer.defs RCS file: /cvs/gstreamer/gst-python/gstreamer/gstreamer.defs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- a/gstreamer.defs 24 Feb 2004 18:40:21 -0000 1.7 +++ b/gstreamer.defs 25 Feb 2004 12:12:58 -0000 1.8 @@ -1,797 +1,6 @@ ;; -*- scheme -*- -; object definitions ... -(define-object Object - (in-module "Gst") - (parent "GObject") - (c-name "GstObject") - (gtype-id "GST_TYPE_OBJECT") -) -(define-object Index - (parent "GstObject") - (c-name "GstIndex") - (gtype-id "GST_TYPE_INDEX") -(define-object Element - (c-name "GstElement") - (gtype-id "GST_TYPE_ELEMENT") -(define-object Bin - (parent "GstElement") - (c-name "GstBin") - (gtype-id "GST_TYPE_BIN") -(define-object Clock - (c-name "GstClock") - (gtype-id "GST_TYPE_CLOCK") -(define-object Pad - (c-name "GstPad") - (gtype-id "GST_TYPE_PAD") -(define-object GhostPad - (parent "GstPad") - (c-name "GstGhostPad") - (gtype-id "GST_TYPE_GHOST_PAD") -(define-object PadTemplate - (c-name "GstPadTemplate") - (gtype-id "GST_TYPE_PAD_TEMPLATE") -(define-object Pipeline - (parent "GstBin") - (c-name "GstPipeline") - (gtype-id "GST_TYPE_PIPELINE") -(define-object PluginFeature - (c-name "GstPluginFeature") - (gtype-id "GST_TYPE_PLUGIN_FEATURE") -(define-object IndexFactory - (parent "GstPluginFeature") - (c-name "GstIndexFactory") - (gtype-id "GST_TYPE_INDEX_FACTORY") -(define-object ElementFactory - (c-name "GstElementFactory") - (gtype-id "GST_TYPE_ELEMENT_FACTORY") -(define-object Queue - (c-name "GstQueue") - (gtype-id "GST_TYPE_QUEUE") -(define-object RealPad - (c-name "GstRealPad") - (gtype-id "GST_TYPE_REAL_PAD") -(define-object Registry - (c-name "GstRegistry") - (gtype-id "GST_TYPE_REGISTRY") -(define-object Scheduler - (c-name "GstScheduler") - (gtype-id "GST_TYPE_SCHEDULER") -(define-object SchedulerFactory - (c-name "GstSchedulerFactory") - (gtype-id "GST_TYPE_SCHEDULER_FACTORY") -(define-object SystemClock - (parent "GstClock") - (c-name "GstSystemClock") - (gtype-id "GST_TYPE_SYSTEM_CLOCK") -(define-object Thread - (c-name "GstThread") - (gtype-id "GST_TYPE_THREAD") -(define-object TypeFindFactory - (c-name "GstTypeFindFactory") - (gtype-id "GST_TYPE_TYPE_FIND_FACTORY") -(define-object XML - (c-name "GstXML") - (gtype-id "GST_TYPE_XML") -;; Enumerations and flags ... -(define-enum BinFlags - (c-name "GstBinFlags") - (gtype-id "GST_TYPE_BIN_FLAGS") - (values - '("flag-manager" "GST_BIN_FLAG_MANAGER") - '("self-schedulable" "GST_BIN_SELF_SCHEDULABLE") - '("flag-prefer-cothreads" "GST_BIN_FLAG_PREFER_COTHREADS") - '("flag-fixed-clock" "GST_BIN_FLAG_FIXED_CLOCK") - '("flag-last" "GST_BIN_FLAG_LAST") - ) -(define-enum BufferFlag - (c-name "GstBufferFlag") - (gtype-id "GST_TYPE_BUFFER_FLAG") - '("readonly" "GST_BUFFER_READONLY") - '("subbuffer" "GST_BUFFER_SUBBUFFER") - '("original" "GST_BUFFER_ORIGINAL") - '("dontfree" "GST_BUFFER_DONTFREE") - '("key-unit" "GST_BUFFER_KEY_UNIT") - '("dontkeep" "GST_BUFFER_DONTKEEP") - '("flag-last" "GST_BUFFER_FLAG_LAST") -(define-enum ClockEntryStatus - (c-name "GstClockEntryStatus") - (gtype-id "GST_TYPE_CLOCK_ENTRY_STATUS") - '("ok" "GST_CLOCK_ENTRY_OK") - '("early" "GST_CLOCK_ENTRY_EARLY") - '("restart" "GST_CLOCK_ENTRY_RESTART") -(define-enum ClockEntryType - (c-name "GstClockEntryType") - (gtype-id "GST_TYPE_CLOCK_ENTRY_TYPE") - '("single" "GST_CLOCK_ENTRY_SINGLE") - '("periodic" "GST_CLOCK_ENTRY_PERIODIC") -(define-enum ClockReturn - (c-name "GstClockReturn") - (gtype-id "GST_TYPE_CLOCK_RETURN") - '("stopped" "GST_CLOCK_STOPPED") - '("timeout" "GST_CLOCK_TIMEOUT") - '("early" "GST_CLOCK_EARLY") - '("error" "GST_CLOCK_ERROR") - '("unsupported" "GST_CLOCK_UNSUPPORTED") -(define-flags ClockFlags - (c-name "GstClockFlags") - (gtype-id "GST_TYPE_CLOCK_FLAGS") - '("do-single-sync" "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC") - '("do-single-async" "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC") - '("do-periodic-sync" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC") - '("do-periodic-async" "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC") - '("set-resolution" "GST_CLOCK_FLAG_CAN_SET_RESOLUTION") - '("set-speed" "GST_CLOCK_FLAG_CAN_SET_SPEED") -(define-flags CPUFlags - (c-name "GstCPUFlags") - (gtype-id "GST_TYPE_CPU_FLAGS") - '("mmx" "GST_CPU_FLAG_MMX") - '("sse" "GST_CPU_FLAG_SSE") - '("mmxext" "GST_CPU_FLAG_MMXEXT") - '("3dnow" "GST_CPU_FLAG_3DNOW") -(define-enum DataFlags - (c-name "GstDataFlags") - (gtype-id "GST_TYPE_DATA_FLAGS") - '("readonly" "GST_DATA_READONLY") - '("flag-last" "GST_DATA_FLAG_LAST") -(define-enum ElementFlags - (c-name "GstElementFlags") - (gtype-id "GST_TYPE_ELEMENT_FLAGS") - '("complex" "GST_ELEMENT_COMPLEX") - '("decoupled" "GST_ELEMENT_DECOUPLED") - '("thread-suggested" "GST_ELEMENT_THREAD_SUGGESTED") - '("infinite-loop" "GST_ELEMENT_INFINITE_LOOP") - '("new-loopfunc" "GST_ELEMENT_NEW_LOOPFUNC") - '("event-aware" "GST_ELEMENT_EVENT_AWARE") - '("use-threadsafe-properties" "GST_ELEMENT_USE_THREADSAFE_PROPERTIES") - '("scheduler-private1" "GST_ELEMENT_SCHEDULER_PRIVATE1") - '("scheduler-private2" "GST_ELEMENT_SCHEDULER_PRIVATE2") - '("locked-state" "GST_ELEMENT_LOCKED_STATE") - '("in-error" "GST_ELEMENT_IN_ERROR") - '("flag-last" "GST_ELEMENT_FLAG_LAST") -(define-enum CoreError - (c-name "GstCoreError") - (gtype-id "GST_TYPE_CORE_ERROR") - '("failed" "GST_CORE_ERROR_FAILED") - '("too-lazy" "GST_CORE_ERROR_TOO_LAZY") - '("not-implemented" "GST_CORE_ERROR_NOT_IMPLEMENTED") - '("state-change" "GST_CORE_ERROR_STATE_CHANGE") - '("pad" "GST_CORE_ERROR_PAD") - '("thread" "GST_CORE_ERROR_THREAD") - '("scheduler" "GST_CORE_ERROR_SCHEDULER") - '("negotiation" "GST_CORE_ERROR_NEGOTIATION") - '("event" "GST_CORE_ERROR_EVENT") - '("seek" "GST_CORE_ERROR_SEEK") - '("caps" "GST_CORE_ERROR_CAPS") - '("tag" "GST_CORE_ERROR_TAG") - '("num-errors" "GST_CORE_ERROR_NUM_ERRORS") -(define-enum LibraryError - (c-name "GstLibraryError") - (gtype-id "GST_TYPE_LIBRARY_ERROR") - '("failed" "GST_LIBRARY_ERROR_FAILED") - '("too-lazy" "GST_LIBRARY_ERROR_TOO_LAZY") - '("init" "GST_LIBRARY_ERROR_INIT") - '("shutdown" "GST_LIBRARY_ERROR_SHUTDOWN") - '("settings" "GST_LIBRARY_ERROR_SETTINGS") - '("encode" "GST_LIBRARY_ERROR_ENCODE") - '("num-errors" "GST_LIBRARY_ERROR_NUM_ERRORS") -(define-enum ResourceError - (c-name "GstResourceError") - (gtype-id "GST_TYPE_RESOURCE_ERROR") - '("failed" "GST_RESOURCE_ERROR_FAILED") - '("too-lazy" "GST_RESOURCE_ERROR_TOO_LAZY") - '("not-found" "GST_RESOURCE_ERROR_NOT_FOUND") - '("busy" "GST_RESOURCE_ERROR_BUSY") - '("open-read" "GST_RESOURCE_ERROR_OPEN_READ") - '("open-write" "GST_RESOURCE_ERROR_OPEN_WRITE") - '("open-read-write" "GST_RESOURCE_ERROR_OPEN_READ_WRITE") - '("close" "GST_RESOURCE_ERROR_CLOSE") - '("read" "GST_RESOURCE_ERROR_READ") - '("write" "GST_RESOURCE_ERROR_WRITE") - '("seek" "GST_RESOURCE_ERROR_SEEK") - '("sync" "GST_RESOURCE_ERROR_SYNC") - '("settings" "GST_RESOURCE_ERROR_SETTINGS") - '("num-errors" "GST_RESOURCE_ERROR_NUM_ERRORS") -(define-enum StreamError - (c-name "GstStreamError") - (gtype-id "GST_TYPE_STREAM_ERROR") - '("failed" "GST_STREAM_ERROR_FAILED") - '("too-lazy" "GST_STREAM_ERROR_TOO_LAZY") - '("not-implemented" "GST_STREAM_ERROR_NOT_IMPLEMENTED") - '("type-not-found" "GST_STREAM_ERROR_TYPE_NOT_FOUND") - '("wrong-type" "GST_STREAM_ERROR_WRONG_TYPE") - '("codec-not-found" "GST_STREAM_ERROR_CODEC_NOT_FOUND") - '("decode" "GST_STREAM_ERROR_DECODE") - '("encode" "GST_STREAM_ERROR_ENCODE") - '("demux" "GST_STREAM_ERROR_DEMUX") - '("mux" "GST_STREAM_ERROR_MUX") - '("format" "GST_STREAM_ERROR_FORMAT") - '("num-errors" "GST_STREAM_ERROR_NUM_ERRORS") -(define-enum EventType - (c-name "GstEventType") - (gtype-id "GST_TYPE_EVENT_TYPE") - '("unknown" "GST_EVENT_UNKNOWN") - '("eos" "GST_EVENT_EOS") - '("flush" "GST_EVENT_FLUSH") - '("empty" "GST_EVENT_EMPTY") - '("discontinuous" "GST_EVENT_DISCONTINUOUS") - '("qos" "GST_EVENT_QOS") - '("seek" "GST_EVENT_SEEK") - '("seek-segment" "GST_EVENT_SEEK_SEGMENT") - '("segment-done" "GST_EVENT_SEGMENT_DONE") - '("size" "GST_EVENT_SIZE") - '("rate" "GST_EVENT_RATE") - '("filler" "GST_EVENT_FILLER") - '("ts-offset" "GST_EVENT_TS_OFFSET") - '("interrupt" "GST_EVENT_INTERRUPT") - '("navigation" "GST_EVENT_NAVIGATION") - '("tag" "GST_EVENT_TAG") -(define-flags EventFlag - (c-name "GstEventFlag") - (gtype-id "GST_TYPE_EVENT_FLAG") - '("event-flag-none" "GST_EVENT_FLAG_NONE") - '("rate-flag-negative" "GST_RATE_FLAG_NEGATIVE") -(define-flags SeekType - (c-name "GstSeekType") - (gtype-id "GST_TYPE_SEEK_TYPE") - '("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") -(define-enum SeekAccuracy - (c-name "GstSeekAccuracy") - (gtype-id "GST_TYPE_SEEK_ACCURACY") - '("certain" "GST_SEEK_CERTAIN") - '("fuzzy" "GST_SEEK_FUZZY") -(define-enum Format - (c-name "GstFormat") - (gtype-id "GST_TYPE_FORMAT") - '("undefined" "GST_FORMAT_UNDEFINED") - '("default" "GST_FORMAT_DEFAULT") - '("bytes" "GST_FORMAT_BYTES") - '("time" "GST_FORMAT_TIME") - '("buffers" "GST_FORMAT_BUFFERS") - '("percent" "GST_FORMAT_PERCENT") -(define-enum IndexCertainty - (c-name "GstIndexCertainty") - (gtype-id "GST_TYPE_INDEX_CERTAINTY") - '("unknown" "GST_INDEX_UNKNOWN") - '("certain" "GST_INDEX_CERTAIN") - '("fuzzy" "GST_INDEX_FUZZY") -(define-enum IndexEntryType - (c-name "GstIndexEntryType") - (gtype-id "GST_TYPE_INDEX_ENTRY_TYPE") - '("id" "GST_INDEX_ENTRY_ID") - '("association" "GST_INDEX_ENTRY_ASSOCIATION") - '("object" "GST_INDEX_ENTRY_OBJECT") - '("format" "GST_INDEX_ENTRY_FORMAT") -(define-enum IndexLookupMethod - (c-name "GstIndexLookupMethod") - (gtype-id "GST_TYPE_INDEX_LOOKUP_METHOD") - '("exact" "GST_INDEX_LOOKUP_EXACT") - '("before" "GST_INDEX_LOOKUP_BEFORE") - '("after" "GST_INDEX_LOOKUP_AFTER") -(define-flags AssocFlags - (c-name "GstAssocFlags") - (gtype-id "GST_TYPE_ASSOC_FLAGS") - '("none" "GST_ASSOCIATION_FLAG_NONE") - '("key-unit" "GST_ASSOCIATION_FLAG_KEY_UNIT") - '("last" "GST_ASSOCIATION_FLAG_LAST") -(define-enum IndexResolverMethod - (c-name "GstIndexResolverMethod") - (gtype-id "GST_TYPE_INDEX_RESOLVER_METHOD") - '("custom" "GST_INDEX_RESOLVER_CUSTOM") - '("gtype" "GST_INDEX_RESOLVER_GTYPE") - '("path" "GST_INDEX_RESOLVER_PATH") -(define-enum IndexFlags - (c-name "GstIndexFlags") - (gtype-id "GST_TYPE_INDEX_FLAGS") - '("writable" "GST_INDEX_WRITABLE") - '("readable" "GST_INDEX_READABLE") - '("flag-last" "GST_INDEX_FLAG_LAST") -(define-enum DebugLevel - (c-name "GstDebugLevel") - (gtype-id "GST_TYPE_DEBUG_LEVEL") - '("none" "GST_LEVEL_NONE") - '("error" "GST_LEVEL_ERROR") - '("warning" "GST_LEVEL_WARNING") - '("info" "GST_LEVEL_INFO") - '("debug" "GST_LEVEL_DEBUG") - '("log" "GST_LEVEL_LOG") - '("count" "GST_LEVEL_COUNT") -(define-enum DebugColorFlags - (c-name "GstDebugColorFlags") - (gtype-id "GST_TYPE_DEBUG_COLOR_FLAGS") - '("fg-black" "GST_DEBUG_FG_BLACK") - '("fg-red" "GST_DEBUG_FG_RED") - '("fg-green" "GST_DEBUG_FG_GREEN") - '("fg-yellow" "GST_DEBUG_FG_YELLOW") - '("fg-blue" "GST_DEBUG_FG_BLUE") - '("fg-magenta" "GST_DEBUG_FG_MAGENTA") - '("fg-cyan" "GST_DEBUG_FG_CYAN") - '("fg-white" "GST_DEBUG_FG_WHITE") - '("bg-black" "GST_DEBUG_BG_BLACK") - '("bg-red" "GST_DEBUG_BG_RED") - '("bg-green" "GST_DEBUG_BG_GREEN") - '("bg-yellow" "GST_DEBUG_BG_YELLOW") - '("bg-blue" "GST_DEBUG_BG_BLUE") - '("bg-magenta" "GST_DEBUG_BG_MAGENTA") - '("bg-cyan" "GST_DEBUG_BG_CYAN") - '("bg-white" "GST_DEBUG_BG_WHITE") - '("bold" "GST_DEBUG_BOLD") - '("underline" "GST_DEBUG_UNDERLINE") -(define-enum ObjectFlags - (c-name "GstObjectFlags") - (gtype-id "GST_TYPE_OBJECT_FLAGS") - '("destroyed" "GST_DESTROYED") - '("floating" "GST_FLOATING") - '("object-flag-last" "GST_OBJECT_FLAG_LAST") -(define-enum PadLinkReturn - (c-name "GstPadLinkReturn") - (gtype-id "GST_TYPE_PAD_LINK_RETURN") - '("refused" "GST_PAD_LINK_REFUSED") - '("delayed" "GST_PAD_LINK_DELAYED") - '("ok" "GST_PAD_LINK_OK") - '("done" "GST_PAD_LINK_DONE") -(define-enum PadDirection - (c-name "GstPadDirection") - (gtype-id "GST_TYPE_PAD_DIRECTION") - '("unknown" "GST_PAD_UNKNOWN") - '("src" "GST_PAD_SRC") - '("sink" "GST_PAD_SINK") -(define-enum PadFlags - (c-name "GstPadFlags") - (gtype-id "GST_TYPE_PAD_FLAGS") - '("disabled" "GST_PAD_DISABLED") - '("negotiating" "GST_PAD_NEGOTIATING") - '("flag-last" "GST_PAD_FLAG_LAST") -(define-enum PadPresence - (c-name "GstPadPresence") - (gtype-id "GST_TYPE_PAD_PRESENCE") - '("always" "GST_PAD_ALWAYS") - '("sometimes" "GST_PAD_SOMETIMES") - '("request" "GST_PAD_REQUEST") -(define-enum PadTemplateFlags - (c-name "GstPadTemplateFlags") - (gtype-id "GST_TYPE_PAD_TEMPLATE_FLAGS") - '("ixed" "GST_PAD_TEMPLATE_FIXED") - '("lag-last" "GST_PAD_TEMPLATE_FLAG_LAST") -(define-enum ParseError - (c-name "GstParseError") - (gtype-id "GST_TYPE_PARSE_ERROR") - '("syntax" "GST_PARSE_ERROR_SYNTAX") - '("no-such-element" "GST_PARSE_ERROR_NO_SUCH_ELEMENT") - '("no-such-property" "GST_PARSE_ERROR_NO_SUCH_PROPERTY") - '("link" "GST_PARSE_ERROR_LINK") - '("could-not-set-property" "GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY") - '("empty-bin" "GST_PARSE_ERROR_EMPTY_BIN") - '("empty" "GST_PARSE_ERROR_EMPTY") -(define-enum PluginError - (c-name "GstPluginError") - (gtype-id "GST_TYPE_PLUGIN_ERROR") - '("module" "GST_PLUGIN_ERROR_MODULE") - '("dependencies" "GST_PLUGIN_ERROR_DEPENDENCIES") - '("name-mismatch" "GST_PLUGIN_ERROR_NAME_MISMATCH") -(define-enum QueryType - (c-name "GstQueryType") - (gtype-id "GST_TYPE_QUERY_TYPE") - '("none" "GST_QUERY_NONE") - '("total" "GST_QUERY_TOTAL") - '("position" "GST_QUERY_POSITION") - '("latency" "GST_QUERY_LATENCY") - '("jitter" "GST_QUERY_JITTER") - '("start" "GST_QUERY_START") - '("segment-end" "GST_QUERY_SEGMENT_END") - '("rate" "GST_QUERY_RATE") -(define-flags RegistryReturn - (c-name "GstRegistryReturn") - (gtype-id "GST_TYPE_REGISTRY_RETURN") - '("ok" "GST_REGISTRY_OK") - '("load-error" "GST_REGISTRY_LOAD_ERROR") - '("save-error" "GST_REGISTRY_SAVE_ERROR") - '("plugin-load-error" "GST_REGISTRY_PLUGIN_LOAD_ERROR") - '("plugin-signature-error" "GST_REGISTRY_PLUGIN_SIGNATURE_ERROR") -(define-flags RegistryFlags - (c-name "GstRegistryFlags") - (gtype-id "GST_TYPE_REGISTRY_FLAGS") - '("readable" "GST_REGISTRY_READABLE") - '("writable" "GST_REGISTRY_WRITABLE") - '("exists" "GST_REGISTRY_EXISTS") - '("remote" "GST_REGISTRY_REMOTE") - '("delayed-loading" "GST_REGISTRY_DELAYED_LOADING") -(define-enum SchedulerFlags - (c-name "GstSchedulerFlags") - (gtype-id "GST_TYPE_SCHEDULER_FLAGS") - '("fixed-clock" "GST_SCHEDULER_FLAG_FIXED_CLOCK") - '("last" "GST_SCHEDULER_FLAG_LAST") -(define-enum SchedulerState - (c-name "GstSchedulerState") - (gtype-id "GST_TYPE_SCHEDULER_STATE") - '("none" "GST_SCHEDULER_STATE_NONE") - '("running" "GST_SCHEDULER_STATE_RUNNING") - '("stopped" "GST_SCHEDULER_STATE_STOPPED") - '("error" "GST_SCHEDULER_STATE_ERROR") -(define-enum TagMergeMode - (c-name "GstTagMergeMode") - (gtype-id "GST_TYPE_TAG_MERGE_MODE") - '("undefined" "GST_TAG_MERGE_UNDEFINED") - '("replace-all" "GST_TAG_MERGE_REPLACE_ALL") - '("replace" "GST_TAG_MERGE_REPLACE") - '("append" "GST_TAG_MERGE_APPEND") - '("prepend" "GST_TAG_MERGE_PREPEND") - '("keep" "GST_TAG_MERGE_KEEP") - '("keep-all" "GST_TAG_MERGE_KEEP_ALL") - '("count" "GST_TAG_MERGE_COUNT") -(define-enum TagFlag - (c-name "GstTagFlag") - (gtype-id "GST_TYPE_TAG_FLAG") - '("undefined" "GST_TAG_FLAG_UNDEFINED") - '("meta" "GST_TAG_FLAG_META") - '("encoded" "GST_TAG_FLAG_ENCODED") - '("decoded" "GST_TAG_FLAG_DECODED") - '("count" "GST_TAG_FLAG_COUNT") -(define-enum ThreadState - (c-name "GstThreadState") - (gtype-id "GST_TYPE_THREAD_STATE") - '("state-spinning" "GST_THREAD_STATE_SPINNING") - '("state-reaping" "GST_THREAD_STATE_REAPING") - '("mutex-locked" "GST_THREAD_MUTEX_LOCKED") - '("flag-last" "GST_THREAD_FLAG_LAST") -(define-flags AllocTraceFlags - (c-name "GstAllocTraceFlags") - (gtype-id "GST_TYPE_ALLOC_TRACE_FLAGS") - '("live" "GST_ALLOC_TRACE_LIVE") - '("mem-live" "GST_ALLOC_TRACE_MEM_LIVE") -(define-enum TypeFindProbability - (c-name "GstTypeFindProbability") - (gtype-id "GST_TYPE_TYPE_FIND_PROBABILITY") - '("minimum" "GST_TYPE_FIND_MINIMUM") - '("possible" "GST_TYPE_FIND_POSSIBLE") - '("likely" "GST_TYPE_FIND_LIKELY") - '("nearly-certain" "GST_TYPE_FIND_NEARLY_CERTAIN") - '("maximum" "GST_TYPE_FIND_MAXIMUM") -(define-flags ElementState - (c-name "GstElementState") - (gtype-id "GST_TYPE_ELEMENT_STATE") - '("void-pending" "GST_STATE_VOID_PENDING") - '("null" "GST_STATE_NULL") - '("ready" "GST_STATE_READY") - '("paused" "GST_STATE_PAUSED") - '("playing" "GST_STATE_PLAYING") -(define-enum ElementStateReturn - (c-name "GstElementStateReturn") - (gtype-id "GST_TYPE_ELEMENT_STATE_RETURN") - '("failure" "GST_STATE_FAILURE") - '("success" "GST_STATE_SUCCESS") - '("async" "GST_STATE_ASYNC") -(define-enum Result - (c-name "GstResult") - (gtype-id "GST_TYPE_RESULT") - '("ok" "GST_RESULT_OK") - '("nok" "GST_RESULT_NOK") - '("not-impl" "GST_RESULT_NOT_IMPL") -(define-enum URIType - (c-name "GstURIType") - (gtype-id "GST_TYPE_URI_TYPE") - '("unknown" "GST_URI_UNKNOWN") - '("sink" "GST_URI_SINK") - '("src" "GST_URI_SRC") +(include "gst-types.defs") ;; From /opt/gnome/include/gstreamer-0.7/gst/gstatomic.h @@ -6880,29 +6089,6 @@ ) -;; -*- scheme -*- -;; -;; Boxed types -(define-boxed Buffer - (c-name "GstBuffer") - (gtype-id "GST_TYPE_BUFFER") -(define-boxed Caps - (c-name "GstCaps") - (gtype-id "GST_TYPE_CAPS") -(define-boxed Event - (c-name "GstEvent") - (gtype-id "GST_TYPE_EVENT") ;; ;; Accelerate common GstBin iterate loop @@ -6935,36 +6121,18 @@ ;; HACK -(define-method get_data - (of-object "GstBuffer") - (c-name "gst_buffer_get_data") - (return-type "char*") -(define-method set_data - (c-name "gst_buffer_set_data") - (return-type "none") - (parameters - '("char*" "data") -;; 0.7 Boxed types -(define-boxed Structure - (c-name "GstStructure") - (gtype-id "GST_TYPE_STRUCTURE") -(define-boxed TagList - (c-name "GstTagList") - (gtype-id "GST_TYPE_TAG_LIST") +;(define-method get_data +; (of-object "GstBuffer") +; (c-name "gst_buffer_get_data") +; (return-type "char*") +;) +;(define-method set_data +; (c-name "gst_buffer_set_data") +; (return-type "none") +; (parameters +; '("char*" "data") +; ) Index: gstreamermodule.c RCS file: /cvs/gstreamer/gst-python/gstreamer/gstreamermodule.c,v --- a/gstreamermodule.c 23 Feb 2004 18:19:38 -0000 1.5 +++ b/gstreamermodule.c 25 Feb 2004 12:12:58 -0000 1.6 @@ -28,10 +28,10 @@ #include <pygobject.h> #include <gst/gst.h> -void pygstreamer_register_classes (PyObject *d); -void pygstreamer_add_constants(PyObject *module, const gchar *strip_prefix); +void pygst_register_classes (PyObject *d); +void pygst_add_constants(PyObject *module, const gchar *strip_prefix); -extern PyMethodDef pygstreamer_functions[]; +extern PyMethodDef pygst_functions[]; DL_EXPORT(void) init_gst (void) @@ -61,7 +61,7 @@ g_free (argv[i]); g_free (argv); } - PyErr_SetString (PyExc_RuntimeError, "can't initialize module gstreamer"); + PyErr_SetString (PyExc_RuntimeError, "can't initialize module gst"); } if (argv != NULL) { PySys_SetArgv (argc, argv); @@ -70,13 +70,13 @@ g_free (argv); - m = Py_InitModule ("gst._gst", pygstreamer_functions); + m = Py_InitModule ("gst._gst", pygst_functions); d = PyModule_GetDict (m); - pygstreamer_register_classes (d); - pygstreamer_add_constants (m, "GST_"); + pygst_register_classes (d); + pygst_add_constants (m, "GST_"); if (PyErr_Occurred ()) { - Py_FatalError ("can't initialize module gstreamer"); + Py_FatalError ("can't initialize module gst"); } } |