diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-06-03 20:56:22 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-06-03 20:56:22 +0200 |
| commit | aba607129cc30f66d946109c50522674b1663af9 (patch) | |
| tree | 2b8189156ba52886e80dc405ce841f94cc529edd | |
| parent | 7a5766004442e1c7c3100a02aa9a43ead5f3e649 (diff) | |
Remove some custom code now that the code generator correctly handles ownership of out parameters
| -rw-r--r-- | gstreamer-sharp/Gstreamer.metadata | 3 | ||||
| -rw-r--r-- | gstreamer-sharp/Pad.custom | 22 |
2 files changed, 0 insertions, 25 deletions
diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata index 2595784..f6e3e3a 100644 --- a/gstreamer-sharp/Gstreamer.metadata +++ b/gstreamer-sharp/Gstreamer.metadata @@ -550,9 +550,6 @@ <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_remove_data_probe']" name="hidden">1</attr> <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_remove_event_probe']" name="hidden">1</attr> <attr path="/api/namespace/object[@name='Pad']/constructor[@cname='gst_pad_new_from_static_template']" name="hidden">1</attr> - <!-- FIXME: https://bugzilla.novell.com/show_bug.cgi?id=498498 --> - <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_alloc_buffer']" name="hidden">1</attr> - <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_alloc_buffer_and_set_caps']" name="hidden">1</attr> <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_pull_range']" name="hidden">1</attr> <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_alloc_buffer']/parameters/parameter[@name='buf']" name="pass_as">out</attr> <attr path="/api/namespace/object[@name='Pad']/method[@cname='gst_pad_alloc_buffer']/parameters/parameter[@name='buf']" name="owned">true</attr> diff --git a/gstreamer-sharp/Pad.custom b/gstreamer-sharp/Pad.custom index b0a7476..09967bc 100644 --- a/gstreamer-sharp/Pad.custom +++ b/gstreamer-sharp/Pad.custom @@ -33,28 +33,6 @@ public void RemoveBufferProbe (ulong handler_id) { } [DllImport("libgstreamer-0.10.dll") ] -static extern int gst_pad_alloc_buffer (IntPtr raw, ulong offset, int size, IntPtr caps, out IntPtr buf); - -public Gst.FlowReturn AllocBuffer (ulong offset, int size, Gst.Caps caps, out Gst.Buffer buf) { - IntPtr native_buf; - int raw_ret = gst_pad_alloc_buffer (Handle, offset, size, caps == null ? IntPtr.Zero : caps.Handle, out native_buf); - Gst.FlowReturn ret = (Gst.FlowReturn) raw_ret; - buf = native_buf == IntPtr.Zero ? null : (Gst.Buffer) Gst.MiniObject.GetObject (native_buf, true); - return ret; -} - -[DllImport("libgstreamer-0.10.dll") ] -static extern int gst_pad_alloc_buffer_and_set_caps (IntPtr raw, ulong offset, int size, IntPtr caps, out IntPtr buf); - -public Gst.FlowReturn AllocBufferAndSetCaps (ulong offset, int size, Gst.Caps caps, out Gst.Buffer buf) { - IntPtr native_buf; - int raw_ret = gst_pad_alloc_buffer_and_set_caps (Handle, offset, size, caps == null ? IntPtr.Zero : caps.Handle, out native_buf); - Gst.FlowReturn ret = (Gst.FlowReturn) raw_ret; - buf = native_buf == IntPtr.Zero ? null : (Gst.Buffer) Gst.MiniObject.GetObject (native_buf, true); - return ret; -} - -[DllImport("libgstreamer-0.10.dll") ] static extern void gst_pad_set_bufferalloc_function (IntPtr raw, GstSharp.PadBufferAllocFunctionNative bufalloc); public Gst.PadBufferAllocFunction BufferAllocFunction { |