mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

VideoOverlay: Fix issues on 32 bits

Browse source
This commit is contained in:
Stephan Sundermann 2015-05-28 15:57:16 +02:00 committed by Stephan Sundermann
parent 2bf30fd612
commit 9556b05947
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
samples/BasicTutorial5.cs
View file

@ -50,7 +50,7 @@ namespace GstreamerSharp
{ {
var widget = (Widget)sender; var widget = (Widget)sender;
var window = widget.Window; var window = widget.Window;
ulong windowID = 0; IntPtr windowID = IntPtr.Zero;
// Retrieve window handler from GDK // Retrieve window handler from GDK
switch (System.Environment.OSVersion.Platform) { switch (System.Environment.OSVersion.Platform) {
@ -61,7 +61,7 @@ namespace GstreamerSharp
case PlatformID.Win32S: case PlatformID.Win32S:
case PlatformID.Win32Windows: case PlatformID.Win32Windows:
case PlatformID.WinCE: case PlatformID.WinCE:
windowID = (ulong) gdk_win32_drawable_get_handle (window.Handle); windowID = gdk_win32_drawable_get_handle (window.Handle);
break; break;
} }
@ -356,7 +356,7 @@ namespace GstreamerSharp
} }
[DllImport ("libgdk-3.so.0") ] [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") ] [DllImport ("libgdk-win32-3.0-0.dll") ]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle); static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle);
@ -364,4 +364,4 @@ namespace GstreamerSharp
[DllImport ("libX11.so.6")] [DllImport ("libX11.so.6")]
static extern int XInitThreads (); static extern int XInitThreads ();
} }
} }

6
samples/VideoOverlay.cs
View file

@ -16,7 +16,7 @@ namespace Gstreameroverlay
{ {
public class MainWindow : Gtk.Window { public class MainWindow : Gtk.Window {
DrawingArea _da; DrawingArea _da;
ulong _xWindowId; IntPtr _xWindowId;
Element _playbin; Element _playbin;
HScale _scale; HScale _scale;
Label _lbl; Label _lbl;
@ -40,7 +40,7 @@ namespace Gstreameroverlay
case PlatformID.Win32S: case PlatformID.Win32S:
case PlatformID.Win32Windows: case PlatformID.Win32Windows:
case PlatformID.WinCE: 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; break;
} }
@ -263,7 +263,7 @@ namespace Gstreameroverlay
} }
[DllImport ("libgdk-3.so.0") ] [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") ] [DllImport ("libgdk-win32-3.0-0.dll") ]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle); static extern IntPtr gdk_win32_drawable_get_handle (IntPtr handle);

1
sources/gstreamer-sharp.metadata
View file

@ -132,6 +132,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
<attr path="/api/namespace/struct[@cname='GstByteReader']" name="opaque">1</attr> <attr path="/api/namespace/struct[@cname='GstByteReader']" name="opaque">1</attr>
<remove-node path="/api/namespace//struct[@cname='GstByteReader']//method"/> <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="//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 --> <!-- 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> <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>