mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

Iterator: Next try to fix crashes

Browse source
This commit is contained in:
Stephan Sundermann 2013-10-12 17:54:30 +02:00
parent 3a2d6750f1
commit 7d6ad28a35
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sources/custom/Iterator.cs
View file

@ -34,6 +34,15 @@ namespace Gst {
[DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_value_reset (ref GLib.Value val); static extern IntPtr g_value_reset (ref GLib.Value val);
[DllImport("libgstreamer-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern int gst_iterator_next(IntPtr raw, ref GLib.Value elem);
public Gst.IteratorResult Next(ref GLib.Value elem) {
int raw_ret = gst_iterator_next(Handle, ref elem);
Gst.IteratorResult ret = (Gst.IteratorResult) raw_ret;
return ret;
}
private class Enumerator : IEnumerator { private class Enumerator : IEnumerator {
Iterator iterator; Iterator iterator;
Hashtable seen = new Hashtable (); Hashtable seen = new Hashtable ();
@ -53,11 +62,10 @@ namespace Gst {
return false; return false;
do { do {
GLib.Value value = new GLib.Value (); GLib.Value value = new GLib.Value (GLib.GType.Boolean);
IntPtr ptr = g_value_reset (ref value); value.Dispose ();
value = (GLib.Value) Marshal.PtrToStructure (ptr, typeof(GLib.Value));
IteratorResult ret = iterator.Next (out value); IteratorResult ret = iterator.Next (ref value);
switch (ret) { switch (ret) {
case IteratorResult.Done: case IteratorResult.Done:

1
sources/gstreamer-sharp.metadata
View file

@ -49,6 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<attr path="/api/namespace/struct[@cname='GstStructure']" name="native">true</attr> <attr path="/api/namespace/struct[@cname='GstStructure']" name="native">true</attr>
<change-node-type path="/api/namespace//boxed[@cname='GstIterator']">struct</change-node-type> <change-node-type path="/api/namespace//boxed[@cname='GstIterator']">struct</change-node-type>
<attr path="/api/namespace/struct[@cname='GstIterator']" name="native">true</attr> <attr path="/api/namespace/struct[@cname='GstIterator']" name="native">true</attr>
<attr path="/api/namespace/struct[@cname='GstIterator']/method[@cname='gst_iterator_next']" name="hidden">true</attr>
<remove-node path="/api/namespace/boxed[@cname='GstStructure']/field[@cname='name']" /> <remove-node path="/api/namespace/boxed[@cname='GstStructure']/field[@cname='name']" />
<!-- Maybe some problems with the name --> <!-- Maybe some problems with the name -->
<remove-node path="/api/namespace/interface[@cname='GstURIHandler']/class_struct/method[@vm='get_type']" name="vm" /> <remove-node path="/api/namespace/interface[@cname='GstURIHandler']/class_struct/method[@vm='get_type']" name="vm" />