mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

The GMutex and GCond API uses macros to function tables instead of real function

Browse source 
We need to add real functions for these macros. Fixes bug #647529.
This commit is contained in:
Sebastian Dröge 2011-04-13 17:33:05 +02:00
parent 9713ead713
commit e67cf80368
2 changed files with 56 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gstreamer-sharp/Clock.custom
View file

@ -21,15 +21,15 @@ private IntPtr EntriesChangedPtr {
}
}
[DllImport ("libglib-2.0-0.dll") ]
static extern void g_cond_wait (IntPtr cond, IntPtr mutex);
[DllImport ("libglib-2.0-0.dll") ]
static extern bool g_cond_timed_wait (IntPtr cond, IntPtr mutex, ref _TimeVal abs_time);
[DllImport ("libglib-2.0-0.dll") ]
static extern void g_cond_broadcast (IntPtr cond);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern void gstsharp_g_cond_wait (IntPtr cond, IntPtr mutex);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern bool gstsharp_g_cond_timed_wait (IntPtr cond, IntPtr mutex, ref _TimeVal abs_time);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern void gstsharp_g_cond_broadcast (IntPtr cond);
public void Wait () {
g_cond_wait (EntriesChangedPtr, LockPtr);
gstsharp_g_cond_wait (EntriesChangedPtr, LockPtr);
}
[StructLayout (LayoutKind.Sequential) ]
@ -44,7 +44,7 @@ public bool Wait (uint mseconds) {
long usec = 1000 * (mseconds - sec * 1000);
tv.sec = (IntPtr) (sec);
tv.usec = (IntPtr) (usec);
return g_cond_timed_wait (EntriesChangedPtr, LockPtr, ref tv);
return gstsharp_g_cond_timed_wait (EntriesChangedPtr, LockPtr, ref tv);
}
public bool Wait (TimeSpan timespan) {
@ -53,11 +53,11 @@ public bool Wait (TimeSpan timespan) {
long usec = 1000 * ( ( (long) timespan.TotalMilliseconds) - sec * 1000);
tv.sec = (IntPtr) (sec);
tv.usec = (IntPtr) (usec);
return g_cond_timed_wait (EntriesChangedPtr, LockPtr, ref tv);
return gstsharp_g_cond_timed_wait (EntriesChangedPtr, LockPtr, ref tv);
}
public void Broadcast () {
g_cond_broadcast (EntriesChangedPtr);
gstsharp_g_cond_broadcast (EntriesChangedPtr);
}
[DllImport ("gstreamersharpglue-0.10.dll") ]
@ -73,23 +73,23 @@ private IntPtr SlaveLockPtr {
}
}
[DllImport ("libglib-2.0-0.dll") ]
static extern void g_mutex_lock (IntPtr mutex);
[DllImport ("libglib-2.0-0.dll") ]
static extern void g_mutex_unlock (IntPtr mutex);
[DllImport ("libglib-2.0-0.dll") ]
static extern bool g_mutex_trylock (IntPtr mutex);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern void gstsharp_g_mutex_lock (IntPtr mutex);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern void gstsharp_g_mutex_unlock (IntPtr mutex);
[DllImport ("gstreamersharpglue-0.10.dll") ]
static extern bool gstsharp_g_mutex_trylock (IntPtr mutex);
public void SlaveLock () {
g_mutex_lock (SlaveLockPtr);
gstsharp_g_mutex_lock (SlaveLockPtr);
}
public void SlaveUnlock () {
g_mutex_unlock (SlaveLockPtr);
gstsharp_g_mutex_unlock (SlaveLockPtr);
}
public bool TrySlaveLock () {
return g_mutex_trylock (SlaveLockPtr);
return gstsharp_g_mutex_trylock (SlaveLockPtr);
}
[DllImport ("libgstreamer-0.10.dll") ]

37
gstreamer-sharp/glue/clock.c
View file

@ -23,3 +23,40 @@ gstsharp_gst_clock_get_times_offset (void)
{
return (guint) G_STRUCT_OFFSET (GstClock, times);
}
void
gstsharp_g_cond_wait (GCond * cond, GMutex * mutex)
{
g_cond_wait (cond, mutex);
}
gboolean
gstsharp_g_cond_timed_wait (GCond *cond, GMutex *mutex, GTimeVal *abs_time)
{
return g_cond_timed_wait (cond, mutex, abs_time);
}
void
gstsharp_g_cond_broadcast (GCond *cond)
{
g_cond_broadcast (cond);
}
void
gstsharp_g_mutex_lock (GMutex *mutex)
{
g_mutex_lock (mutex);
}
void
gstsharp_g_mutex_unlock (GMutex *mutex)
{
g_mutex_unlock (mutex);
}
gboolean
gstsharp_g_mutex_trylock (GMutex *mutex)
{
return g_mutex_trylock (mutex);
}