summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Sundermann <stephansundermann@gmail.com>2015-05-28 15:57:16 +0200
committerStephan Sundermann <ssundermann@gnome.org>2015-05-28 16:00:04 +0200
commit9556b05947a43cbeea57113f427d6bde5246c77f (patch)
tree584ad55831f1d9b1e8aca5ee77f0fef7ae2de98a
parent2bf30fd612a399643521c08e388dfe823b023f4b (diff)
VideoOverlay: Fix issues on 32 bits
-rw-r--r--samples/BasicTutorial5.cs8
-rw-r--r--samples/VideoOverlay.cs6
-rw-r--r--sources/gstreamer-sharp.metadata1
3 files changed, 8 insertions, 7 deletions
diff --git a/samples/BasicTutorial5.cs b/samples/BasicTutorial5.cs
index b169349..b82564d 100644
--- a/samples/BasicTutorial5.cs
+++ b/samples/BasicTutorial5.cs
@@ -50,7 +50,7 @@ namespace GstreamerSharp
{
var widget = (Widget)sender;
var window = widget.Window;
- ulong windowID = 0;
+ IntPtr windowID = IntPtr.Zero;
// Retrieve window handler from GDK
switch (System.Environment.OSVersion.Platform) {
@@ -61,7 +61,7 @@ namespace GstreamerSharp
case PlatformID.Win32S:
case PlatformID.Win32Windows:
case PlatformID.WinCE:
- windowID = (ulong) gdk_win32_drawable_get_handle (window.Handle);
+ windowID = gdk_win32_drawable_get_handle (window.Handle);
break;
}
@@ -356,7 +356,7 @@ namespace GstreamerSharp
}
[DllImport ("libgdk-3.so.0") ]
- static extern uint gdk_x11_window_get_xid (IntPtr handle);
+ static extern IntPtr gdk_x11_window_get_xid (IntPtr handle);
[DllImport ("libgdk-win32-3.0-0.dll") ]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle);
@@ -364,4 +364,4 @@ namespace GstreamerSharp
[DllImport ("libX11.so.6")]
static extern int XInitThreads ();
}
-} \ No newline at end of file
+}
diff --git a/samples/VideoOverlay.cs b/samples/VideoOverlay.cs
index 00b6e4e..e0e335b 100644
--- a/samples/VideoOverlay.cs
+++ b/samples/VideoOverlay.cs
@@ -16,7 +16,7 @@ namespace Gstreameroverlay
{
public class MainWindow : Gtk.Window {
DrawingArea _da;
- ulong _xWindowId;
+ IntPtr _xWindowId;
Element _playbin;
HScale _scale;
Label _lbl;
@@ -40,7 +40,7 @@ namespace Gstreameroverlay
case PlatformID.Win32S:
case PlatformID.Win32Windows:
case PlatformID.WinCE:
- window._xWindowId = (ulong) gdk_win32_drawable_get_handle (window._da.GdkWindow.Handle);
+ window._xWindowId = gdk_win32_drawable_get_handle (window._da.GdkWindow.Handle);
break;
}
@@ -263,7 +263,7 @@ namespace Gstreameroverlay
}
[DllImport ("libgdk-3.so.0") ]
- static extern uint gdk_x11_window_get_xid (IntPtr handle);
+ static extern IntPtr gdk_x11_window_get_xid (IntPtr handle);
[DllImport ("libgdk-win32-3.0-0.dll") ]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle);
diff --git a/sources/gstreamer-sharp.metadata b/sources/gstreamer-sharp.metadata
index 17aa8e9..158d66b 100644
--- a/sources/gstreamer-sharp.metadata
+++ b/sources/gstreamer-sharp.metadata
@@ -132,6 +132,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
<attr path="/api/namespace/struct[@cname='GstByteReader']" name="opaque">1</attr>
<remove-node path="/api/namespace//struct[@cname='GstByteReader']//method"/>
<attr path="//struct[@name='VideoGLTextureUploadMeta']//field[@cname='user_data_copy' or @cname='user_data_free']" name="hidden">true</attr>
+ <attr path="//interface[@cname='GstVideoOverlay']//parameter[@type='guintptr']" name="type">gpointer</attr>
<!-- FIXME: remove when https://bugzilla.gnome.org/show_bug.cgi?id=709938 is fixed -->
<attr path="/api/namespace/interface[@cname='GstNavigation']/method[@cname='gst_navigation_query_parse_commands_length']/parameters/parameter[@name='n_cmds']" name="pass_as">out</attr>