forks/geeqie: src/image-load.c annotate

annotate src/image-load.c @ 1875:e9b157ab56a6

first stereo support

author	Vladimir Nadvornik <nadvornik@suse.cz>
date	Fri, 28 Jan 2011 11:05:07 +0100
parents	d525caac8cad
children	039d5c8864a0

rev	line source
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1 /*
196 bdad1cacadf4 rename GQview -> Geeqie over the code Vladimir Nadvornik <nadvornik@suse.cz> parents: 176 diff changeset	2 * Geeqie
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	3 * (C) 2004 John Ellis
1802 359d910c7ce0 added 2010 to copyright text Vladimir Nadvornik <nadvornik@suse.cz> parents: 1756 diff changeset	4 * Copyright (C) 2008 - 2010 The Geeqie Team
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	5 *
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	6 * Author: John Ellis
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	7 *
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	8 * This software is released under the GNU General Public License (GNU GPL).
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	9 * Please read the included file COPYING for more information.
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	10 * This software comes with no warranty of any kind, use at your own risk!
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	11 */
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	12
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	13
281 b1c2c2cf19d4 gqview.h -> main.h Laurent Monin <geeqie@norz.org> parents: 196 diff changeset	14 #include "main.h"
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	15 #include "image-load.h"
507 7408e89b601d Move debug macros from main.h to new debug.h. Laurent Monin <geeqie@norz.org> parents: 506 diff changeset	16
7408e89b601d Move debug macros from main.h to new debug.h. Laurent Monin <geeqie@norz.org> parents: 506 diff changeset	17 #include "exif.h"
586 122fc2223b42 split filelist.c to filefilter.c and filedata.c Vladimir Nadvornik <nadvornik@suse.cz> parents: 507 diff changeset	18 #include "filedata.h"
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	19 #include "ui_fileops.h"
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	20 #include "gq-marshal.h"
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	21
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	22 #include <fcntl.h>
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	23 #include <sys/mman.h>
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	24
1512 5d7489b1a16b dropped read_buffer options - they don't have any significant effect Vladimir Nadvornik <nadvornik@suse.cz> parents: 1498 diff changeset	25 #define IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT 4096
5d7489b1a16b dropped read_buffer options - they don't have any significant effect Vladimir Nadvornik <nadvornik@suse.cz> parents: 1498 diff changeset	26 #define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT 1
5d7489b1a16b dropped read_buffer options - they don't have any significant effect Vladimir Nadvornik <nadvornik@suse.cz> parents: 1498 diff changeset	27
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	28
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	29 /**************************************************************************************/
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	30 /* image loader class */
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	31
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	32
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	33 enum {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	34 SIGNAL_AREA_READY = 0,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	35 SIGNAL_ERROR,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	36 SIGNAL_DONE,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	37 SIGNAL_PERCENT,
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	38 SIGNAL_SIZE,
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	39 SIGNAL_COUNT
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	40 };
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	41
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	42 static guint signals[SIGNAL_COUNT] = { 0 };
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	43
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	44 static void image_loader_init(GTypeInstance *instance, gpointer g_class);
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	45 static void image_loader_class_init(ImageLoaderClass *class);
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	46 static void image_loader_finalize(GObject *object);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	47 static void image_loader_stop(ImageLoader *il);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	48
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	49 GType image_loader_get_type(void)
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	50 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	51 static GType type = 0;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	52 if (type == 0)
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	53 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	54 static const GTypeInfo info = {
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	55 sizeof(ImageLoaderClass),
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	56 NULL, /* base_init */
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	57 NULL, /* base_finalize */
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	58 (GClassInitFunc)image_loader_class_init, /* class_init */
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	59 NULL, /* class_finalize */
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	60 NULL, /* class_data */
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	61 sizeof(ImageLoader),
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	62 0, /* n_preallocs */
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	63 (GInstanceInitFunc)image_loader_init, /* instance_init */
1016 22a1364f1eea Fix two minor compilation warnings. Laurent Monin <geeqie@norz.org> parents: 1015 diff changeset	64 NULL /* value_table */
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	65 };
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	66 type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, 0);
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	67 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	68 return type;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	69 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	70
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	71 static void image_loader_init(GTypeInstance *instance, gpointer g_class)
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	72 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	73 ImageLoader il = (ImageLoader )instance;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	74
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	75 il->pixbuf = NULL;
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	76 il->idle_id = 0;
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	77 il->idle_priority = G_PRIORITY_DEFAULT_IDLE;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	78 il->done = FALSE;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	79 il->loader = NULL;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	80
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	81 il->bytes_read = 0;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	82 il->bytes_total = 0;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	83
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	84 il->idle_done_id = 0;
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	85
1512 5d7489b1a16b dropped read_buffer options - they don't have any significant effect Vladimir Nadvornik <nadvornik@suse.cz> parents: 1498 diff changeset	86 il->idle_read_loop_count = IMAGE_LOADER_IDLE_READ_LOOP_COUNT_DEFAULT;
5d7489b1a16b dropped read_buffer options - they don't have any significant effect Vladimir Nadvornik <nadvornik@suse.cz> parents: 1498 diff changeset	87 il->read_buffer_size = IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT;
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	88 il->mapped_file = NULL;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	89
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	90 il->requested_width = 0;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	91 il->requested_height = 0;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	92 il->shrunk = FALSE;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	93
1026 9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	94 il->can_destroy = TRUE;
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	95
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	96 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	97 il->data_mutex = g_mutex_new();
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	98 il->can_destroy_cond = g_cond_new();
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	99 #endif
1559 a207eb3b00ce Fix up few warnings (especially on 64bits platforms). Laurent Monin <geeqie@norz.org> parents: 1524 diff changeset	100 DEBUG_1("new image loader %p, bufsize=%" G_GSIZE_FORMAT " idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count);
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	101 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	102
1346 b3378273091e No space between function name and first parenthesis, it eases greping (see CODING). Laurent Monin <geeqie@norz.org> parents: 1284 diff changeset	103 static void image_loader_class_init(ImageLoaderClass *class)
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	104 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	105 GObjectClass *gobject_class = G_OBJECT_CLASS (class);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	106
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	107 // gobject_class->set_property = image_loader_set_property;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	108 // gobject_class->get_property = image_loader_get_property;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	109
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	110 gobject_class->finalize = image_loader_finalize;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	111
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	112
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	113 signals[SIGNAL_AREA_READY] =
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	114 g_signal_new("area_ready",
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	115 G_OBJECT_CLASS_TYPE(gobject_class),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	116 G_SIGNAL_RUN_LAST,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	117 G_STRUCT_OFFSET(ImageLoaderClass, area_ready),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	118 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	119 gq_marshal_VOID__INT_INT_INT_INT,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	120 G_TYPE_NONE, 4,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	121 G_TYPE_INT,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	122 G_TYPE_INT,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	123 G_TYPE_INT,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	124 G_TYPE_INT);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	125
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	126 signals[SIGNAL_ERROR] =
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	127 g_signal_new("error",
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	128 G_OBJECT_CLASS_TYPE(gobject_class),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	129 G_SIGNAL_RUN_LAST,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	130 G_STRUCT_OFFSET(ImageLoaderClass, error),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	131 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	132 g_cclosure_marshal_VOID__VOID,
1026 9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	133 G_TYPE_NONE, 0);
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	134
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	135 signals[SIGNAL_DONE] =
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	136 g_signal_new("done",
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	137 G_OBJECT_CLASS_TYPE(gobject_class),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	138 G_SIGNAL_RUN_LAST,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	139 G_STRUCT_OFFSET(ImageLoaderClass, done),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	140 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	141 g_cclosure_marshal_VOID__VOID,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	142 G_TYPE_NONE, 0);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	143
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	144 signals[SIGNAL_PERCENT] =
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	145 g_signal_new("percent",
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	146 G_OBJECT_CLASS_TYPE(gobject_class),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	147 G_SIGNAL_RUN_LAST,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	148 G_STRUCT_OFFSET(ImageLoaderClass, percent),
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	149 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	150 g_cclosure_marshal_VOID__DOUBLE,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	151 G_TYPE_NONE, 1,
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	152 G_TYPE_DOUBLE);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	153
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	154 signals[SIGNAL_SIZE] =
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	155 g_signal_new("size_prepared",
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	156 G_OBJECT_CLASS_TYPE(gobject_class),
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	157 G_SIGNAL_RUN_LAST,
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	158 G_STRUCT_OFFSET(ImageLoaderClass, area_ready),
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	159 NULL, NULL,
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	160 gq_marshal_VOID__INT_INT,
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	161 G_TYPE_NONE, 2,
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	162 G_TYPE_INT,
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	163 G_TYPE_INT);
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	164
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	165 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	166
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	167 static void image_loader_finalize(GObject *object)
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	168 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	169 ImageLoader il = (ImageLoader )object;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	170
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	171 image_loader_stop(il);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	172
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	173 if (il->error) DEBUG_1("%s", image_loader_get_error(il));
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	174
1559 a207eb3b00ce Fix up few warnings (especially on 64bits platforms). Laurent Monin <geeqie@norz.org> parents: 1524 diff changeset	175 DEBUG_1("freeing image loader %p bytes_read=%" G_GSIZE_FORMAT, il, il->bytes_read);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	176
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	177 if (il->idle_done_id)
e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	178 {
e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	179 g_source_remove(il->idle_done_id);
e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	180 il->idle_done_id = 0;
e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	181 }
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	182
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	183 while (g_source_remove_by_user_data(il))
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	184 {
1498 2b0712dcf139 improved debug messages Vladimir Nadvornik <nadvornik@suse.cz> parents: 1497 diff changeset	185 DEBUG_2("pending signals detected");
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	186 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	187
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	188 while (il->area_param_list)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	189 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	190 DEBUG_1("pending area_ready signals detected");
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	191 while (g_source_remove_by_user_data(il->area_param_list->data)) {}
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	192 g_free(il->area_param_list->data);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	193 il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	194 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	195
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	196 while (il->area_param_delayed_list)
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	197 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	198 g_free(il->area_param_delayed_list->data);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	199 il->area_param_delayed_list = g_list_delete_link(il->area_param_delayed_list, il->area_param_delayed_list);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	200 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	201
1043 718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	202 if (il->pixbuf) g_object_unref(il->pixbuf);
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	203
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	204 if (il->error) g_error_free(il->error);
1043 718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	205
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	206 file_data_unref(il->fd);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	207 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	208 g_mutex_free(il->data_mutex);
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	209 g_cond_free(il->can_destroy_cond);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	210 #endif
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	211 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	212
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	213 void image_loader_free(ImageLoader *il)
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	214 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	215 if (!il) return;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	216 g_object_unref(G_OBJECT(il));
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	217 }
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	218
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	219
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	220 ImageLoader image_loader_new(FileData fd)
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	221 {
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	222 ImageLoader *il;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	223
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	224 if (!fd) return NULL;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	225
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	226 il = (ImageLoader *) g_object_new(TYPE_IMAGE_LOADER, NULL);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	227
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	228 il->fd = file_data_ref(fd);
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	229
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	230 return il;
409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	231 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	232
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	233 /**************************************************************************************/
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	234 /* send signals via idle calbacks - the callback are executed in the main thread */
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	235
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	236 typedef struct _ImageLoaderAreaParam ImageLoaderAreaParam;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	237 struct _ImageLoaderAreaParam {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	238 ImageLoader *il;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	239 guint x;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	240 guint y;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	241 guint w;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	242 guint h;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	243 };
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	244
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	245
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	246 static gboolean image_loader_emit_area_ready_cb(gpointer data)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	247 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	248 ImageLoaderAreaParam *par = data;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	249 ImageLoader *il = par->il;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	250 g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	251 g_mutex_lock(il->data_mutex);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	252 il->area_param_list = g_list_remove(il->area_param_list, par);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	253 g_free(par);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	254 g_mutex_unlock(il->data_mutex);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	255
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	256 return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	257 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	258
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	259 static gboolean image_loader_emit_done_cb(gpointer data)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	260 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	261 ImageLoader *il = data;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	262 g_signal_emit(il, signals[SIGNAL_DONE], 0);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	263 return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	264 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	265
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	266 static gboolean image_loader_emit_error_cb(gpointer data)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	267 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	268 ImageLoader *il = data;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	269 g_signal_emit(il, signals[SIGNAL_ERROR], 0);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	270 return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	271 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	272
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	273 static gboolean image_loader_emit_percent_cb(gpointer data)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	274 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	275 ImageLoader *il = data;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	276 g_signal_emit(il, signals[SIGNAL_PERCENT], 0, image_loader_get_percent(il));
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	277 return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	278 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	279
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	280 /* DONE and ERROR are emited only once, thus they can have normal priority
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	281 PERCENT and AREA_READY should be processed ASAP
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	282 */
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	283
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	284 static void image_loader_emit_done(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	285 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	286 g_idle_add_full(il->idle_priority, image_loader_emit_done_cb, il, NULL);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	287 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	288
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	289 static void image_loader_emit_error(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	290 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	291 g_idle_add_full(il->idle_priority, image_loader_emit_error_cb, il, NULL);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	292 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	293
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	294 static void image_loader_emit_percent(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	295 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	296 g_idle_add_full(G_PRIORITY_HIGH, image_loader_emit_percent_cb, il, NULL);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	297 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	298
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	299 /* this function expects that il->data_mutex is locked by caller */
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	300 static void image_loader_emit_area_ready(ImageLoader *il, guint x, guint y, guint w, guint h)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	301 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	302 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	303 par->il = il;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	304 par->x = x;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	305 par->y = y;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	306 par->w = w;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	307 par->h = h;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	308
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	309 il->area_param_list = g_list_prepend(il->area_param_list, par);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	310
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	311 g_idle_add_full(G_PRIORITY_HIGH, image_loader_emit_area_ready_cb, par, NULL);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	312 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	313
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	314 /**************************************************************************************/
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	315 /* the following functions may be executed in separate thread */
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	316
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	317 /* this function expects that il->data_mutex is locked by caller */
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	318 static void image_loader_queue_delayed_erea_ready(ImageLoader *il, guint x, guint y, guint w, guint h)
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	319 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	320 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	321 par->il = il;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	322 par->x = x;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	323 par->y = y;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	324 par->w = w;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	325 par->h = h;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	326
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	327 il->area_param_delayed_list = g_list_prepend(il->area_param_delayed_list, par);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	328 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	329
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	330
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	331
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	332 static gboolean image_loader_get_stopping(ImageLoader *il)
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	333 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	334 gboolean ret;
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	335 if (!il) return FALSE;
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	336
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	337 g_mutex_lock(il->data_mutex);
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	338 ret = il->stopping;
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	339 g_mutex_unlock(il->data_mutex);
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	340
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	341 return ret;
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	342 }
799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	343
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	344
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	345 static void image_loader_sync_pixbuf(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	346 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	347 GdkPixbuf *pb;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	348
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	349 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	350
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	351 if (!il->loader)
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	352 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	353 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	354 return;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	355 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	356
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	357 pb = gdk_pixbuf_loader_get_pixbuf(il->loader);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	358
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	359 if (pb == il->pixbuf)
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	360 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	361 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	362 return;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	363 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	364
1875 e9b157ab56a6 first stereo support Vladimir Nadvornik <nadvornik@suse.cz> parents: 1865 diff changeset	365 if (g_ascii_strcasecmp(".jps", il->fd->extension) == 0)
e9b157ab56a6 first stereo support Vladimir Nadvornik <nadvornik@suse.cz> parents: 1865 diff changeset	366 {
e9b157ab56a6 first stereo support Vladimir Nadvornik <nadvornik@suse.cz> parents: 1865 diff changeset	367 g_object_set_data(G_OBJECT(pb), "stereo_sbs", GINT_TO_POINTER(1));
e9b157ab56a6 first stereo support Vladimir Nadvornik <nadvornik@suse.cz> parents: 1865 diff changeset	368 }
e9b157ab56a6 first stereo support Vladimir Nadvornik <nadvornik@suse.cz> parents: 1865 diff changeset	369
1043 718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	370 if (il->pixbuf) g_object_unref(il->pixbuf);
718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	371
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	372 il->pixbuf = pb;
1043 718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	373 if (il->pixbuf) g_object_ref(il->pixbuf);
718ab8111f48 Replaced gtk depreceated code. Petr Ostadal <postadal@suse.cz> parents: 1036 diff changeset	374
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	375 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	376 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	377
500 b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	378 static void image_loader_area_updated_cb(GdkPixbufLoader *loader,
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	379 guint x, guint y, guint w, guint h,
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	380 gpointer data)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	381 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	382 ImageLoader *il = data;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	383
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	384 if (!image_loader_get_pixbuf(il))
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	385 {
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	386 image_loader_sync_pixbuf(il);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	387 if (!image_loader_get_pixbuf(il))
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	388 {
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	389 log_printf("critical: area_ready signal with NULL pixbuf (out of mem?)\n");
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	390 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	391 }
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	392
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	393 g_mutex_lock(il->data_mutex);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	394 if (il->delay_area_ready)
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	395 image_loader_queue_delayed_erea_ready(il, x, y, w, h);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	396 else
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	397 image_loader_emit_area_ready(il, x, y, w, h);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	398 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	399 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	400
500 b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	401 static void image_loader_area_prepared_cb(GdkPixbufLoader *loader, gpointer data)
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	402 {
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	403 GdkPixbuf *pb;
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	404 guchar *pix;
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	405 size_t h, rs;
961 22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	406
1722 908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	407 /* a workaround for
908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	408 http://bugzilla.gnome.org/show_bug.cgi?id=547669
908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	409 http://bugzilla.gnome.org/show_bug.cgi?id=589334
908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	410 */
961 22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	411 gchar *format = gdk_pixbuf_format_get_name(gdk_pixbuf_loader_get_format(loader));
1722 908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	412 if (strcmp(format, "svg") == 0 \|\|
908bec607442 workaround for xpm loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1559 diff changeset	413 strcmp(format, "xpm") == 0)
961 22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	414 {
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	415 g_free(format);
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	416 return;
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	417 }
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	418
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669 Vladimir Nadvornik <nadvornik@suse.cz> parents: 890 diff changeset	419 g_free(format);
500 b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	420
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	421 pb = gdk_pixbuf_loader_get_pixbuf(loader);
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	422
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	423 h = gdk_pixbuf_get_height(pb);
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	424 rs = gdk_pixbuf_get_rowstride(pb);
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	425 pix = gdk_pixbuf_get_pixels(pb);
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	426
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	427 memset(pix, 0, rs * h); /this should be faster than pixbuf_fill /
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	428
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	429 }
b075634458d0 clear the buffer before loading of an image Vladimir Nadvornik <nadvornik@suse.cz> parents: 495 diff changeset	430
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	431 static void image_loader_size_cb(GdkPixbufLoader *loader,
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	432 gint width, gint height, gpointer data)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	433 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	434 ImageLoader *il = data;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	435 GdkPixbufFormat *format;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	436 gchar **mime_types;
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	437 gboolean scale = FALSE;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	438 gint n;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	439
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	440 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	441 if (il->requested_width < 1 \|\| il->requested_height < 1)
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	442 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	443 g_mutex_unlock(il->data_mutex);
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	444 g_signal_emit(il, signals[SIGNAL_SIZE], 0, width, height);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	445 return;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	446 }
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	447 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	448
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	449 format = gdk_pixbuf_loader_get_format(loader);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	450 if (!format) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	451
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	452 mime_types = gdk_pixbuf_format_get_mime_types(format);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	453 n = 0;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	454 while (mime_types[n])
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	455 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	456 if (strstr(mime_types[n], "jpeg")) scale = TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	457 n++;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	458 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	459 g_strfreev(mime_types);
442 f698b737556b Big whitespaces cleanup: Laurent Monin <geeqie@norz.org> parents: 413 diff changeset	460
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	461 if (!scale)
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	462 {
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	463 g_signal_emit(il, signals[SIGNAL_SIZE], 0, width, height);
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	464 return;
d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	465 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	466
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	467 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	468
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	469 gint nw, nh;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	470 if (width > il->requested_width \|\| height > il->requested_height)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	471 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	472
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	473 if (((gdouble)il->requested_width / width) < ((gdouble)il->requested_height / height))
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	474 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	475 nw = il->requested_width;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	476 nh = (gdouble)nw / width * height;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	477 if (nh < 1) nh = 1;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	478 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	479 else
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	480 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	481 nh = il->requested_height;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	482 nw = (gdouble)nh / height * width;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	483 if (nw < 1) nw = 1;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	484 }
442 f698b737556b Big whitespaces cleanup: Laurent Monin <geeqie@norz.org> parents: 413 diff changeset	485
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	486 gdk_pixbuf_loader_set_size(loader, nw, nh);
14 38ec1baa05b7 ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### John Ellis <johne@verizon.net> parents: 9 diff changeset	487 il->shrunk = TRUE;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	488 }
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	489 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	490
1865 d525caac8cad Fix the windowsize Klaus Ethgen <Klaus@Ethgen.de> parents: 1802 diff changeset	491 g_signal_emit(il, signals[SIGNAL_SIZE], 0, nw, nh);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	492 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	493
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	494 static void image_loader_stop_loader(ImageLoader *il)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	495 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	496 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	497
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	498 if (il->loader)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	499 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	500 /* some loaders do not have a pixbuf till close, order is important here */
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	501 gdk_pixbuf_loader_close(il->loader, il->error ? NULL : &il->error); /* we are interested in the first error only */
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	502 image_loader_sync_pixbuf(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	503 g_object_unref(G_OBJECT(il->loader));
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	504 il->loader = NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	505 }
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	506 g_mutex_lock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	507 il->done = TRUE;
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	508 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	509 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	510
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	511 static void image_loader_setup_loader(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	512 {
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	513 g_mutex_lock(il->data_mutex);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	514 il->loader = gdk_pixbuf_loader_new();
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	515
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	516 g_signal_connect(G_OBJECT(il->loader), "area_updated",
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	517 G_CALLBACK(image_loader_area_updated_cb), il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	518 g_signal_connect(G_OBJECT(il->loader), "size_prepared",
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	519 G_CALLBACK(image_loader_size_cb), il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	520 g_signal_connect(G_OBJECT(il->loader), "area_prepared",
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	521 G_CALLBACK(image_loader_area_prepared_cb), il);
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	522 g_mutex_unlock(il->data_mutex);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	523 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	524
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	525
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	526 static void image_loader_done(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	527 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	528 image_loader_stop_loader(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	529
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	530 image_loader_emit_done(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	531 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	532
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	533 static void image_loader_error(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	534 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	535 image_loader_stop_loader(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	536
1009 5847765e8189 fixed thumbnail loader for the new raw preview interface Vladimir Nadvornik <nadvornik@suse.cz> parents: 1008 diff changeset	537 DEBUG_1("pixbuf_loader reported load error for: %s", il->fd->path);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	538
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	539 image_loader_emit_error(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	540 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	541
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	542 static gboolean image_loader_continue(ImageLoader *il)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	543 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	544 gint b;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	545 gint c;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	546
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	547 if (!il) return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	548
413 8571030c117a Add two new options to control image read buffer at runtime. Laurent Monin <geeqie@norz.org> parents: 281 diff changeset	549 c = il->idle_read_loop_count ? il->idle_read_loop_count : 1;
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	550 while (c > 0 && !image_loader_get_stopping(il))
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	551 {
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	552 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	553
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	554 if (b == 0)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	555 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	556 image_loader_done(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	557 return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	558 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	559
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	560 if (b < 0 \|\| (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, &il->error)))
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	561 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	562 image_loader_error(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	563 return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	564 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	565
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	566 il->bytes_read += b;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	567
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	568 c--;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	569 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	570
1012 409b52dfe683 converted image loader to a GObject and use signals for notification Vladimir Nadvornik <nadvornik@suse.cz> parents: 1011 diff changeset	571 if (il->bytes_total > 0)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	572 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	573 image_loader_emit_percent(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	574 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	575
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	576 return TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	577 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	578
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	579 static gboolean image_loader_begin(ImageLoader *il)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	580 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	581 gssize b;
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	582
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	583 if (il->pixbuf) return FALSE;
442 f698b737556b Big whitespaces cleanup: Laurent Monin <geeqie@norz.org> parents: 413 diff changeset	584
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	585 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read);
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	586 if (b < 1) return FALSE;
45 113c052136c4 Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 43 diff changeset	587
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	588 image_loader_setup_loader(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	589
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	590 if (!gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, &il->error))
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	591 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	592 image_loader_stop_loader(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	593 return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	594 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	595
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	596 il->bytes_read += b;
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	597
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	598 /* read until size is known */
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	599 while (il->loader && !gdk_pixbuf_loader_get_pixbuf(il->loader) && b > 0 && !image_loader_get_stopping(il))
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	600 {
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	601 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read);
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	602 if (b < 0 \|\| (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, &il->error)))
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	603 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	604 image_loader_stop_loader(il);
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	605 return FALSE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	606 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	607 il->bytes_read += b;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	608 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	609 if (!il->pixbuf) image_loader_sync_pixbuf(il);
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	610
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	611 if (il->bytes_read == il->bytes_total \|\| b < 1)
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	612 {
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	613 /* done, handle (broken) loaders that do not have pixbuf till close */
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	614 image_loader_stop_loader(il);
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	615
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	616 if (!il->pixbuf) return FALSE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	617
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	618 image_loader_done(il);
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	619 return TRUE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	620 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	621
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	622 if (!il->pixbuf)
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	623 {
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	624 image_loader_stop_loader(il);
60 15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	625 return FALSE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	626 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net> John Ellis <johne@verizon.net> parents: 54 diff changeset	627
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	628 return TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	629 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	630
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	631 /**************************************************************************************/
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	632 /* the following functions are always executed in the main thread */
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	633
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	634
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	635 static gboolean image_loader_setup_source(ImageLoader *il)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	636 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	637 struct stat st;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	638 gchar *pathl;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	639
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	640 if (!il \|\| il->loader \|\| il->mapped_file) return FALSE;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	641
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	642 il->mapped_file = NULL;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	643
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	644 if (il->fd)
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	645 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	646 ExifData *exif = exif_read_fd(il->fd);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	647
1060 54806f8e4af5 added option to use exif thumbnails Vladimir Nadvornik <nadvornik@suse.cz> parents: 1055 diff changeset	648 if (options->thumbnails.use_exif)
1559 a207eb3b00ce Fix up few warnings (especially on 64bits platforms). Laurent Monin <geeqie@norz.org> parents: 1524 diff changeset	649 il->mapped_file = exif_get_preview(exif, (guint *)&il->bytes_total, il->requested_width, il->requested_height);
1060 54806f8e4af5 added option to use exif thumbnails Vladimir Nadvornik <nadvornik@suse.cz> parents: 1055 diff changeset	650 else
1559 a207eb3b00ce Fix up few warnings (especially on 64bits platforms). Laurent Monin <geeqie@norz.org> parents: 1524 diff changeset	651 il->mapped_file = exif_get_preview(exif, (guint )&il->bytes_total, 0, 0); / get the largest available preview image or NULL for normal images*/
1060 54806f8e4af5 added option to use exif thumbnails Vladimir Nadvornik <nadvornik@suse.cz> parents: 1055 diff changeset	652
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	653 if (il->mapped_file)
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	654 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	655 il->preview = TRUE;
1060 54806f8e4af5 added option to use exif thumbnails Vladimir Nadvornik <nadvornik@suse.cz> parents: 1055 diff changeset	656 DEBUG_1("Usable reduced size (preview) image loaded from file %s", il->fd->path);
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	657 }
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	658 exif_free_fd(il->fd, exif);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	659 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	660
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	661
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	662 if (!il->mapped_file)
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	663 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	664 /* normal file */
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	665 gint load_fd;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	666
1009 5847765e8189 fixed thumbnail loader for the new raw preview interface Vladimir Nadvornik <nadvornik@suse.cz> parents: 1008 diff changeset	667 pathl = path_from_utf8(il->fd->path);
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	668 load_fd = open(pathl, O_RDONLY \| O_NONBLOCK);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	669 g_free(pathl);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	670 if (load_fd == -1) return FALSE;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	671
1008 2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	672 if (fstat(load_fd, &st) == 0)
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	673 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	674 il->bytes_total = st.st_size;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	675 }
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	676 else
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	677 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	678 close(load_fd);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	679 return FALSE;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	680 }
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	681
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	682 il->mapped_file = mmap(0, il->bytes_total, PROT_READ\|PROT_WRITE, MAP_PRIVATE, load_fd, 0);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	683 close(load_fd);
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	684 if (il->mapped_file == MAP_FAILED)
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	685 {
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	686 il->mapped_file = 0;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	687 return FALSE;
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	688 }
2c38f14a2227 use mmaped files image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1000 diff changeset	689 il->preview = FALSE;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	690 }
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	691
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	692 return TRUE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	693 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	694
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	695 static void image_loader_stop_source(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	696 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	697 if (!il) return;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	698
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	699 if (il->mapped_file)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	700 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	701 if (il->preview)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	702 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	703 exif_free_preview(il->mapped_file);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	704 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	705 else
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	706 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	707 munmap(il->mapped_file, il->bytes_total);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	708 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	709 il->mapped_file = NULL;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	710 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	711 }
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	712
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	713 static void image_loader_stop(ImageLoader *il)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	714 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	715 if (!il) return;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	716
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	717 if (il->idle_id)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	718 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	719 g_source_remove(il->idle_id);
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	720 il->idle_id = 0;
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	721 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	722
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	723 if (il->thread)
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	724 {
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	725 /* stop loader in the other thread */
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	726 g_mutex_lock(il->data_mutex);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	727 il->stopping = TRUE;
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	728 while (!il->can_destroy) g_cond_wait(il->can_destroy_cond, il->data_mutex);
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	729 g_mutex_unlock(il->data_mutex);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	730 }
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	731
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	732 image_loader_stop_loader(il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	733 image_loader_stop_source(il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	734
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	735 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	736
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	737 void image_loader_delay_area_ready(ImageLoader *il, gboolean enable)
1045 19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	738 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	739 g_mutex_lock(il->data_mutex);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	740 il->delay_area_ready = enable;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	741 if (!enable)
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	742 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	743 /* send delayed */
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	744 GList list, work;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	745 list = g_list_reverse(il->area_param_delayed_list);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	746 il->area_param_delayed_list = NULL;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	747 g_mutex_unlock(il->data_mutex);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	748
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	749 work = list;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	750
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	751 while (work)
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	752 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	753 ImageLoaderAreaParam *par = work->data;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	754 work = work->next;
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	755
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	756 g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	757 g_free(par);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	758 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	759 g_list_free(list);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	760 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	761 else
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	762 {
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	763 /* just unlock */
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	764 g_mutex_unlock(il->data_mutex);
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	765 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	766 }
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	767
19bc806e0a69 added possibility to redraw only the parts of image that are already Vladimir Nadvornik <nadvornik@suse.cz> parents: 1043 diff changeset	768
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	769 /**************************************************************************************/
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	770 /* execution via idle calls */
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	771
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	772 static gboolean image_loader_idle_cb(gpointer data)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	773 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	774 gboolean ret = FALSE;
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	775 ImageLoader *il = data;
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	776
1523 e52aabe8fc7a Fix up event source ids type: gint -> guint. Laurent Monin <geeqie@norz.org> parents: 1512 diff changeset	777 if (il->idle_id)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	778 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	779 ret = image_loader_continue(il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	780 }
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	781
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	782 if (!ret)
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	783 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	784 image_loader_stop_source(il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	785 }
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	786
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	787 return ret;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	788 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	789
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	790
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	791 static gboolean image_loader_start_idle(ImageLoader *il)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	792 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	793 gboolean ret;
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	794
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	795 if (!il) return FALSE;
14 38ec1baa05b7 ##### Note: GQview CVS on sourceforge is not always up to date, please use ##### John Ellis <johne@verizon.net> parents: 9 diff changeset	796
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	797 if (!il->fd) return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	798
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	799 if (!image_loader_setup_source(il)) return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	800
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	801 ret = image_loader_begin(il);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	802
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	803 if (ret && !il->done) il->idle_id = g_idle_add_full(il->idle_priority, image_loader_idle_cb, il, NULL);
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	804 return ret;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	805 }
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	806
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	807 /**************************************************************************************/
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	808 /* execution via thread */
1524 f88d2282b15a Disable unused functions when compiled without threads support, prevents few warnings. Laurent Monin <geeqie@norz.org> parents: 1523 diff changeset	809
f88d2282b15a Disable unused functions when compiled without threads support, prevents few warnings. Laurent Monin <geeqie@norz.org> parents: 1523 diff changeset	810 #ifdef HAVE_GTHREAD
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	811 static GThreadPool *image_loader_thread_pool = NULL;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	812
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	813 static GCond *image_loader_prio_cond = NULL;
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	814 static GMutex *image_loader_prio_mutex = NULL;
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	815 static gint image_loader_prio_num = 0;
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	816
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	817
1184 4502424815e5 Fix up not a prototype warning. Laurent Monin <geeqie@norz.org> parents: 1060 diff changeset	818 static void image_loader_thread_enter_high(void)
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	819 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	820 g_mutex_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	821 image_loader_prio_num++;
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	822 g_mutex_unlock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	823 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	824
1184 4502424815e5 Fix up not a prototype warning. Laurent Monin <geeqie@norz.org> parents: 1060 diff changeset	825 static void image_loader_thread_leave_high(void)
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	826 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	827 g_mutex_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	828 image_loader_prio_num--;
1438 a45ba50f0f80 fixed possible deadlock with multiple thumb loaders in parallel Vladimir Nadvornik <nadvornik@suse.cz> parents: 1433 diff changeset	829 if (image_loader_prio_num == 0) g_cond_broadcast(image_loader_prio_cond); /* wake up all low prio threads */
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	830 g_mutex_unlock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	831 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	832
1184 4502424815e5 Fix up not a prototype warning. Laurent Monin <geeqie@norz.org> parents: 1060 diff changeset	833 static void image_loader_thread_wait_high(void)
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	834 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	835 g_mutex_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	836 while (image_loader_prio_num)
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	837 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	838 g_cond_wait(image_loader_prio_cond, image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	839 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	840
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	841 g_mutex_unlock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	842 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	843
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	844
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	845 static void image_loader_thread_run(gpointer data, gpointer user_data)
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	846 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	847 ImageLoader *il = data;
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	848 gboolean cont;
1756 0e92370a4183 fixed emitting of error signal from image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1722 diff changeset	849 gboolean err;
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	850
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	851 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	852 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	853 /* low prio, wait untill high prio tasks finishes */
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	854 image_loader_thread_wait_high();
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	855 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	856 else
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	857 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	858 /* high prio */
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	859 image_loader_thread_enter_high();
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	860 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	861
1756 0e92370a4183 fixed emitting of error signal from image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1722 diff changeset	862 err = !image_loader_begin(il);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	863
1756 0e92370a4183 fixed emitting of error signal from image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1722 diff changeset	864 if (err)
1026 9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	865 {
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	866 /*
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	867 loader failed, we have to send signal
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	868 (idle mode returns the image_loader_begin return value directly)
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	869 (success is always reported indirectly from image_loader_begin)
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	870 */
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	871 image_loader_emit_error(il);
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	872 }
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	873
1756 0e92370a4183 fixed emitting of error signal from image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1722 diff changeset	874 cont = !err;
0e92370a4183 fixed emitting of error signal from image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1722 diff changeset	875
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	876 while (cont && !image_loader_get_is_done(il) && !image_loader_get_stopping(il))
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	877 {
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	878 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	879 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	880 /* low prio, wait untill high prio tasks finishes */
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	881 image_loader_thread_wait_high();
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	882 }
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	883 cont = image_loader_continue(il);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	884 }
1020 799621e50c6c improved thread support in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1016 diff changeset	885 image_loader_stop_loader(il);
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	886
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	887 if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	888 {
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	889 /* high prio */
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	890 image_loader_thread_leave_high();
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	891 }
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	892
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	893 g_mutex_lock(il->data_mutex);
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	894 il->can_destroy = TRUE;
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	895 g_cond_signal(il->can_destroy_cond);
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	896 g_mutex_unlock(il->data_mutex);
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	897
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	898 }
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	899
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	900
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	901 static gboolean image_loader_start_thread(ImageLoader *il)
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	902 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	903 if (!il) return FALSE;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	904
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	905 if (!il->fd) return FALSE;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	906
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	907 il->thread = TRUE;
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	908
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	909 if (!image_loader_setup_source(il)) return FALSE;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	910
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	911 if (!image_loader_thread_pool)
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	912 {
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	913 image_loader_thread_pool = g_thread_pool_new(image_loader_thread_run, NULL, -1, FALSE, NULL);
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	914 image_loader_prio_cond = g_cond_new();
e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	915 image_loader_prio_mutex = g_mutex_new();
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	916 }
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	917
1026 9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	918 il->can_destroy = FALSE; /* ImageLoader can't be freed until image_loader_thread_run finishes */
9b1fc7fb3b58 fixed error handling in image loader Vladimir Nadvornik <nadvornik@suse.cz> parents: 1021 diff changeset	919
1021 7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	920 g_thread_pool_push(image_loader_thread_pool, il, NULL);
7f69f43a40b5 use GThreadPool Vladimir Nadvornik <nadvornik@suse.cz> parents: 1020 diff changeset	921 DEBUG_1("Thread pool num threads: %d", g_thread_pool_get_num_threads(image_loader_thread_pool));
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	922
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	923 return TRUE;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	924 }
1524 f88d2282b15a Disable unused functions when compiled without threads support, prevents few warnings. Laurent Monin <geeqie@norz.org> parents: 1523 diff changeset	925 #endif /* HAVE_GTHREAD */
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	926
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	927
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	928 /**************************************************************************************/
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	929 /* public interface */
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	930
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	931
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	932 gboolean image_loader_start(ImageLoader *il)
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	933 {
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	934 if (!il) return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	935
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	936 if (!il->fd) return FALSE;
185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	937
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	938 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	939 return image_loader_start_thread(il);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	940 #else
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	941 return image_loader_start_idle(il);
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	942 #endif
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	943 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	944
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	945
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	946 /* don't forget to gdk_pixbuf_ref() it if you want to use it after image_loader_free() */
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	947 GdkPixbuf image_loader_get_pixbuf(ImageLoader il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	948 {
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	949 GdkPixbuf *ret;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	950 if (!il) return NULL;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	951
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	952 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	953 ret = il->pixbuf;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	954 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	955 return ret;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	956 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	957
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	958 gchar image_loader_get_format(ImageLoader il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	959 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	960 GdkPixbufFormat *format;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	961 gchar **mimev;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	962 gchar *mime;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	963
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	964 if (!il \|\| !il->loader) return NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	965
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	966 format = gdk_pixbuf_loader_get_format(il->loader);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	967 if (!format) return NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	968
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	969 mimev = gdk_pixbuf_format_get_mime_types(format);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	970 if (!mimev) return NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	971
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	972 /* return first member of mimev, as GdkPixbufLoader has no way to tell us which exact one ? */
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	973 mime = g_strdup(mimev[0]);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	974 g_strfreev(mimev);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	975
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	976 return mime;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	977 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	978
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	979 void image_loader_set_requested_size(ImageLoader *il, gint width, gint height)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	980 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	981 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	982
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	983 g_mutex_lock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	984 il->requested_width = width;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	985 il->requested_height = height;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	986 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	987 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	988
413 8571030c117a Add two new options to control image read buffer at runtime. Laurent Monin <geeqie@norz.org> parents: 281 diff changeset	989 void image_loader_set_buffer_size(ImageLoader *il, guint count)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	990 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	991 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	992
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	993 g_mutex_lock(il->data_mutex);
413 8571030c117a Add two new options to control image read buffer at runtime. Laurent Monin <geeqie@norz.org> parents: 281 diff changeset	994 il->idle_read_loop_count = count ? count : 1;
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	995 g_mutex_unlock(il->data_mutex);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	996 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	997
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	998 void image_loader_set_priority(ImageLoader *il, gint priority)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	999 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1000 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1001
1036 e796b3d7cd87 load thumbnails with lower priority Vladimir Nadvornik <nadvornik@suse.cz> parents: 1026 diff changeset	1002 if (il->thread) return; /* can't change prio if the thread already runs */
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1003 il->idle_priority = priority;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1004 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1005
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1006
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1007 gdouble image_loader_get_percent(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1008 {
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1009 gdouble ret;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1010 if (!il) return 0.0;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1011
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1012 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1013 if (il->bytes_total == 0)
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1014 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1015 ret = 0.0;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1016 }
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1017 else
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1018 {
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1019 ret = (gdouble)il->bytes_read / il->bytes_total;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1020 }
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1021 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1022 return ret;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1023 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1024
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1025 gboolean image_loader_get_is_done(ImageLoader *il)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1026 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1027 gboolean ret;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1028 if (!il) return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1029
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1030 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1031 ret = il->done;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1032 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1033
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1034 return ret;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1035 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1036
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1037 FileData image_loader_get_fd(ImageLoader il)
66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1038 {
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1039 FileData *ret;
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1040 if (!il) return NULL;
66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1041
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1042 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1043 ret = il->fd;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1044 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1045
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1046 return ret;
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1047 }
66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1048
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1049 gboolean image_loader_get_shrunk(ImageLoader *il)
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1050 {
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1051 gboolean ret;
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1052 if (!il) return FALSE;
66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1053
1015 8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1054 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1055 ret = il->shrunk;
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1056 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread Vladimir Nadvornik <nadvornik@suse.cz> parents: 1014 diff changeset	1057 return ret;
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1058 }
66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1059
1497 6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1060 const gchar image_loader_get_error(ImageLoader il)
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1061 {
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1062 const gchar *ret = NULL;
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1063 if (!il) return NULL;
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1064 g_mutex_lock(il->data_mutex);
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1065 if (il->error) ret = il->error->message;
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1066 g_mutex_unlock(il->data_mutex);
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1067 return ret;
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1068 }
6b7c3b1ba708 report pixbuf loader errors Vladimir Nadvornik <nadvornik@suse.cz> parents: 1438 diff changeset	1069
1011 66037ee8b4d6 do not access image_loader directly Vladimir Nadvornik <nadvornik@suse.cz> parents: 1009 diff changeset	1070
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	1071 /* FIXME - this can be rather slow and blocks until the size is known */
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1072 gboolean image_load_dimensions(FileData fd, gint width, gint *height)
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1073 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1074 ImageLoader *il;
1433 12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes. Laurent Monin <geeqie@norz.org> parents: 1346 diff changeset	1075 gboolean success;
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1076
138 5be5d1c53016 replaced gchar* path with FileData fd Vladimir Nadvornik <nadvornik@suse.cz>* parents: 60 diff changeset	1077 il = image_loader_new(fd);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1078
1014 185edecefd2d prepared image loader code for threads Vladimir Nadvornik <nadvornik@suse.cz> parents: 1012 diff changeset	1079 success = image_loader_start_idle(il);
9 8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1080
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1081 if (success && il->pixbuf)
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1082 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1083 if (width) *width = gdk_pixbuf_get_width(il->pixbuf);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1084 if (height) *height = gdk_pixbuf_get_height(il->pixbuf);;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1085 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1086 else
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1087 {
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1088 if (width) *width = -1;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1089 if (height) *height = -1;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1090 }
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1091
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1092 image_loader_free(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1093
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1094 return success;
8d9e9edd6fdf Sync to GQview 1.5.9 release. John Ellis <johne@verizon.net> parents: diff changeset	1095 }
1055 4bbdfab3c89a Adding a vim modeline to all files - patch by Klaus Ethgen Vladimir Nadvornik <nadvornik@suse.cz> parents: 1045 diff changeset	1096 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

Mercurial > hg > forks > geeqie

annotate src/image-load.c @ 1875:e9b157ab56a6