projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use init and clear for GMutex and GCond
[projects/chimara/chimara.git]
/
libchimara
/
graphics.c
diff --git
a/libchimara/graphics.c
b/libchimara/graphics.c
index 543ad43563b147a6ecd5ed0f3e0e9cdbe3f443d0..f83ec0eb2001df91878fc52d5d9da7c1377fb6a0 100644
(file)
--- a/
libchimara/graphics.c
+++ b/
libchimara/graphics.c
@@
-56,11
+56,11
@@
load_image_from_blorb(giblorb_result_t resource, glui32 image, gint width, gint
g_free(buffer);
/* Wait for the PixbufLoader to finish loading the image */
g_free(buffer);
/* Wait for the PixbufLoader to finish loading the image */
- g_mutex_lock(glk_data->resource_lock);
+ g_mutex_lock(
&
glk_data->resource_lock);
while(!image_loaded) {
while(!image_loaded) {
- g_cond_wait(
glk_data->resource_loaded,
glk_data->resource_lock);
+ g_cond_wait(
&glk_data->resource_loaded, &
glk_data->resource_lock);
}
}
- g_mutex_unlock(glk_data->resource_lock);
+ g_mutex_unlock(
&
glk_data->resource_lock);
info->pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
g_object_ref(info->pixbuf);
info->pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
g_object_ref(info->pixbuf);
@@
-148,12
+148,12
@@
on_size_prepared(GdkPixbufLoader *loader, gint width, gint height, struct image_
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- g_mutex_lock(glk_data->resource_lock);
+ g_mutex_lock(
&
glk_data->resource_lock);
info->width = width;
info->height = height;
size_determined = TRUE;
info->width = width;
info->height = height;
size_determined = TRUE;
- g_cond_broadcast(glk_data->resource_info_available);
- g_mutex_unlock(glk_data->resource_lock);
+ g_cond_broadcast(
&
glk_data->resource_info_available);
+ g_mutex_unlock(
&
glk_data->resource_lock);
}
void
}
void
@@
-163,10
+163,10
@@
on_pixbuf_closed(GdkPixbufLoader *loader, gpointer data)
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- g_mutex_lock(glk_data->resource_lock);
+ g_mutex_lock(
&
glk_data->resource_lock);
image_loaded = TRUE;
image_loaded = TRUE;
- g_cond_broadcast(glk_data->resource_loaded);
- g_mutex_unlock(glk_data->resource_lock);
+ g_cond_broadcast(
&
glk_data->resource_loaded);
+ g_mutex_unlock(
&
glk_data->resource_lock);
gdk_threads_leave();
}
gdk_threads_leave();
}