Mercurial > hg > forks > geeqie

annotate src/image-load.c @ 1913:3f5bd5479b48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed libjpeg in autoconf
author Vladimir Nadvornik <nadvornik@suse.cz>
date Sat, 09 Apr 2011 19:27:43 +0200
parents d21859e612de
children b0d53312dba7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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"
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
16 #include "image_load_gdk.h"
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
17 #include "image_load_jpeg.h"
507
7408e89b601d Move debug macros from main.h to new debug.h.
Laurent Monin <geeqie@norz.org>
parents: 506
diff changeset
18
7408e89b601d Move debug macros from main.h to new debug.h.
Laurent Monin <geeqie@norz.org>
parents: 506
diff changeset
19 #include "exif.h"
586
122fc2223b42 split filelist.c to filefilter.c and filedata.c
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 507
diff changeset
20 #include "filedata.h"
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
21 #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
22 #include "gq-marshal.h"
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
23
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
24 #include <fcntl.h>
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
25 #include <sys/mman.h>
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
26
1512
5d7489b1a16b dropped read_buffer options - they don't have any significant effect
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1498
diff changeset
27 #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
28 #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
29
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
30
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
31 /**************************************************************************************/
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
32 /* image loader class */
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
33
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
34
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
35 enum {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
36 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
37 SIGNAL_ERROR,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
38 SIGNAL_DONE,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
39 SIGNAL_PERCENT,
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
40 SIGNAL_SIZE,
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
41 SIGNAL_COUNT
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
42 };
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
43
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
44 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
45
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
46 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
47 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
48 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
49 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
50
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
51 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
52 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
53 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
54 if (type == 0)
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
55 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
56 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
57 sizeof(ImageLoaderClass),
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
58 NULL, /* base_init */
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
59 NULL, /* base_finalize */
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
60 (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
61 NULL, /* class_finalize */
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
62 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
63 sizeof(ImageLoader),
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
64 0, /* n_preallocs */
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
65 (GInstanceInitFunc)image_loader_init, /* instance_init */
1016
22a1364f1eea Fix two minor compilation warnings.
Laurent Monin <geeqie@norz.org>
parents: 1015
diff changeset
66 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
67 };
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
68 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
69 }
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
70 return type;
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
71 }
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
72
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
73 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
74 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
75 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
76
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
77 il->pixbuf = NULL;
1523
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
78 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
79 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
80 il->done = FALSE;
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
81 il->loader = NULL;
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
82
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
83 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
84 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
85
1523
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
86 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
87
1512
5d7489b1a16b dropped read_buffer options - they don't have any significant effect
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1498
diff changeset
88 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
89 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
90 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
91
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
92 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
93 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
94 il->shrunk = FALSE;
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
95
1026
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
96 il->can_destroy = TRUE;
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
97
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
98 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
99 il->data_mutex = g_mutex_new();
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
100 il->can_destroy_cond = g_cond_new();
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
101 #endif
1559
a207eb3b00ce Fix up few warnings (especially on 64bits platforms).
Laurent Monin <geeqie@norz.org>
parents: 1524
diff changeset
102 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
103 }
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
104
1346
b3378273091e No space between function name and first parenthesis, it eases greping (see CODING).
Laurent Monin <geeqie@norz.org>
parents: 1284
diff changeset
105 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
106 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
107 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
108
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
109 // 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
110 // 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
111
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
112 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
113
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
114
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
115 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
116 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
117 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
118 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
119 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
120 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
121 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
122 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
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 G_TYPE_INT,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
126 G_TYPE_INT);
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
127
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
128 signals[SIGNAL_ERROR] =
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
129 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
130 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
131 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
132 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
133 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
134 g_cclosure_marshal_VOID__VOID,
1026
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
135 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
136
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
137 signals[SIGNAL_DONE] =
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
138 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
139 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
140 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
141 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
142 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
143 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
144 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
145
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
146 signals[SIGNAL_PERCENT] =
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
147 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
148 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
149 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
150 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
151 NULL, NULL,
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
152 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
153 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
154 G_TYPE_DOUBLE);
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
155
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
156 signals[SIGNAL_SIZE] =
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
157 g_signal_new("size_prepared",
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
158 G_OBJECT_CLASS_TYPE(gobject_class),
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
159 G_SIGNAL_RUN_LAST,
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
160 G_STRUCT_OFFSET(ImageLoaderClass, area_ready),
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
161 NULL, NULL,
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
162 gq_marshal_VOID__INT_INT,
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
163 G_TYPE_NONE, 2,
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
164 G_TYPE_INT,
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
165 G_TYPE_INT);
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
166
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
167 }
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 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
170 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
171 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
172
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
173 image_loader_stop(il);
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
174
1497
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
175 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
176
1559
a207eb3b00ce Fix up few warnings (especially on 64bits platforms).
Laurent Monin <geeqie@norz.org>
parents: 1524
diff changeset
177 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
178
1523
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
179 if (il->idle_done_id)
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
180 {
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
181 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
182 il->idle_done_id = 0;
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
183 }
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
184
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
185 while (g_source_remove_by_user_data(il))
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
186 {
1498
2b0712dcf139 improved debug messages
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1497
diff changeset
187 DEBUG_2("pending signals detected");
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
188 }
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 while (il->area_param_list)
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
191 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
192 DEBUG_1("pending area_ready signals detected");
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
193 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
194 g_free(il->area_param_list->data);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
195 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
196 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
197
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
198 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
199 {
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
200 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
201 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
202 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
203
1043
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
204 if (il->pixbuf) g_object_unref(il->pixbuf);
1497
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
205
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
206 if (il->error) g_error_free(il->error);
1043
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
207
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
208 file_data_unref(il->fd);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
209 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
210 g_mutex_free(il->data_mutex);
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
211 g_cond_free(il->can_destroy_cond);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
212 #endif
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
213 }
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 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
216 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
217 if (!il) return;
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
218 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
219 }
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
220
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 *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
223 {
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
224 ImageLoader *il;
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 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
227
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
228 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
229
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
230 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
231
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
232 return il;
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
233 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
234
1014
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 /* 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
237
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
238 typedef struct _ImageLoaderAreaParam ImageLoaderAreaParam;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
239 struct _ImageLoaderAreaParam {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
240 ImageLoader *il;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
241 guint x;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
242 guint y;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
243 guint w;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
244 guint h;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
245 };
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
246
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
247
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
248 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
249 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
250 ImageLoaderAreaParam *par = data;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
251 ImageLoader *il = par->il;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
252 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
253 g_mutex_lock(il->data_mutex);
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
254 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
255 g_free(par);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
256 g_mutex_unlock(il->data_mutex);
1014
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 return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
259 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
260
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
261 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
262 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
263 ImageLoader *il = data;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
264 g_signal_emit(il, signals[SIGNAL_DONE], 0);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
265 return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
266 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
267
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
268 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
269 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
270 ImageLoader *il = data;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
271 g_signal_emit(il, signals[SIGNAL_ERROR], 0);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
272 return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
273 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
274
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
275 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
276 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
277 ImageLoader *il = data;
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
278 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
279 return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
280 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
281
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
282 /* 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
283 PERCENT and AREA_READY should be processed ASAP
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
284 */
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 static void image_loader_emit_done(ImageLoader *il)
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 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
289 }
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 static void image_loader_emit_error(ImageLoader *il)
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 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
294 }
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 static void image_loader_emit_percent(ImageLoader *il)
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 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
299 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
300
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
301 /* 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
302 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
303 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
304 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
305 par->il = il;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
306 par->x = x;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
307 par->y = y;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
308 par->w = w;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
309 par->h = h;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
310
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
311 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
312
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
313 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
314 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
315
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
316 /**************************************************************************************/
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
317 /* 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
318
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
319 /* this function expects that il->data_mutex is locked by caller */
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
320 static void image_loader_queue_delayed_area_ready(ImageLoader *il, guint x, guint y, guint w, guint h)
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
321 {
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
322 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
323 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
324 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
325 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
326 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
327 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
328
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
329 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
330 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
331
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
332
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
333
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
334 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
335 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
336 gboolean ret;
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
337 if (!il) return FALSE;
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
338
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
339 g_mutex_lock(il->data_mutex);
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
340 ret = il->stopping;
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
341 g_mutex_unlock(il->data_mutex);
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 return ret;
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
344 }
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
345
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
346
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
347 static void image_loader_sync_pixbuf(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
348 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
349 GdkPixbuf *pb;
1015
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 g_mutex_lock(il->data_mutex);
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 if (!il->loader)
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
354 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
355 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
356 return;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
357 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
358
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
359 pb = il->backend.get_pixbuf(il->loader);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
360
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
361 if (pb == il->pixbuf)
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
362 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
363 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
364 return;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
365 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
366
1875
e9b157ab56a6 first stereo support
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1865
diff changeset
367 if (g_ascii_strcasecmp(".jps", il->fd->extension) == 0)
e9b157ab56a6 first stereo support
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1865
diff changeset
368 {
1888
039d5c8864a0 type of source stereo image made adjustable from menu
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1875
diff changeset
369 g_object_set_data(G_OBJECT(pb), "stereo_data", GINT_TO_POINTER(STEREO_PIXBUF_CROSS));
1875
e9b157ab56a6 first stereo support
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1865
diff changeset
370 }
e9b157ab56a6 first stereo support
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1865
diff changeset
371
1043
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
372 if (il->pixbuf) g_object_unref(il->pixbuf);
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
373
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
374 il->pixbuf = pb;
1043
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
375 if (il->pixbuf) g_object_ref(il->pixbuf);
718ab8111f48 Replaced gtk depreceated code.
Petr Ostadal <postadal@suse.cz>
parents: 1036
diff changeset
376
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
377 g_mutex_unlock(il->data_mutex);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
378 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
379
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
380 static void image_loader_area_updated_cb(gpointer loader,
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
381 guint x, guint y, guint w, guint h,
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
382 gpointer data)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
383 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
384 ImageLoader *il = data;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
385
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
386 if (!image_loader_get_pixbuf(il))
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
387 {
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
388 image_loader_sync_pixbuf(il);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
389 if (!image_loader_get_pixbuf(il))
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
390 {
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
391 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
392 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
393 }
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
394
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
395 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
396 if (il->delay_area_ready)
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
397 image_loader_queue_delayed_area_ready(il, x, y, w, h);
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
398 else
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
399 image_loader_emit_area_ready(il, x, y, w, h);
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
400
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
401 if (il->stopping) il->backend.abort(il->loader);
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
402
1045
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
403 g_mutex_unlock(il->data_mutex);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
404 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
405
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
406 static void image_loader_area_prepared_cb(gpointer loader, gpointer data)
500
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
407 {
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
408 ImageLoader *il = data;
500
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
409 GdkPixbuf *pb;
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
410 guchar *pix;
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
411 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
412
1722
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
413 /* a workaround for
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
414 http://bugzilla.gnome.org/show_bug.cgi?id=547669
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
415 http://bugzilla.gnome.org/show_bug.cgi?id=589334
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
416 */
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
417 gchar *format = il->backend.get_format_name(loader);
1722
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
418 if (strcmp(format, "svg") == 0 ||
908bec607442 workaround for xpm loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1559
diff changeset
419 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
420 {
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 890
diff changeset
421 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
422 return;
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 890
diff changeset
423 }
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 890
diff changeset
424
22561991eced a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 890
diff changeset
425 g_free(format);
500
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
426
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
427 pb = il->backend.get_pixbuf(loader);
500
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 h = gdk_pixbuf_get_height(pb);
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
430 rs = gdk_pixbuf_get_rowstride(pb);
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
431 pix = gdk_pixbuf_get_pixels(pb);
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
432
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
433 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
434
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
435 }
b075634458d0 clear the buffer before loading of an image
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 495
diff changeset
436
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
437 static void image_loader_size_cb(gpointer loader,
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
438 gint width, gint height, gpointer data)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
439 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
440 ImageLoader *il = data;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
441 gchar **mime_types;
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
442 gboolean scale = FALSE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
443 gint n;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
444
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
445 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
446 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
447 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
448 g_mutex_unlock(il->data_mutex);
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
449 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
450 return;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
451 }
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
452 g_mutex_unlock(il->data_mutex);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
453
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
454 mime_types = il->backend.get_format_mime_types(loader);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
455 n = 0;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
456 while (mime_types[n])
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
457 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
458 if (strstr(mime_types[n], "jpeg")) scale = TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
459 n++;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
460 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
461 g_strfreev(mime_types);
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 413
diff changeset
462
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
463 if (!scale)
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
464 {
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
465 g_signal_emit(il, signals[SIGNAL_SIZE], 0, width, height);
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
466 return;
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
467 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
468
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
469 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
470
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
471 gint nw, nh;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
472 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
473 {
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 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
476 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
477 nw = il->requested_width;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
478 nh = (gdouble)nw / width * height;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
479 if (nh < 1) nh = 1;
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 else
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
482 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
483 nh = il->requested_height;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
484 nw = (gdouble)nh / height * width;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
485 if (nw < 1) nw = 1;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
486 }
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 413
diff changeset
487
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
488 il->backend.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
489 il->shrunk = TRUE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
490 }
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
491 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
492
1865
d525caac8cad Fix the windowsize
Klaus Ethgen <Klaus@Ethgen.de>
parents: 1802
diff changeset
493 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
494 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
495
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
496 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
497 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
498 if (!il) return;
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 if (il->loader)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
501 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
502 /* some loaders do not have a pixbuf till close, order is important here */
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
503 il->backend.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
504 image_loader_sync_pixbuf(il);
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
505 il->backend.free(il->loader);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
506 il->loader = NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
507 }
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
508 g_mutex_lock(il->data_mutex);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
509 il->done = TRUE;
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
510 g_mutex_unlock(il->data_mutex);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
511 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
512
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
513 static void image_loader_setup_loader(ImageLoader *il)
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
514 {
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
515 g_mutex_lock(il->data_mutex);
1913
3f5bd5479b48 fixed libjpeg in autoconf
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1901
diff changeset
516 #ifdef HAVE_JPEG
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
517 if (il->bytes_total >= 2 && il->mapped_file[0] == 0xff && il->mapped_file[1] == 0xd8)
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
518 {
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
519 DEBUG_1("Using custom jpeg loader");
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
520 image_loader_backend_set_jpeg(&il->backend);
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
521 }
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
522 else
1913
3f5bd5479b48 fixed libjpeg in autoconf
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1901
diff changeset
523 #endif
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
524 image_loader_backend_set_default(&il->backend);
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
525
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
526 il->loader = il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il);
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
527 g_mutex_unlock(il->data_mutex);
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
528 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
529
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
530
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
531 static void image_loader_done(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
532 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
533 image_loader_stop_loader(il);
9
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_emit_done(il);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
536 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
537
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
538 static void image_loader_error(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
539 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
540 image_loader_stop_loader(il);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
541
1009
5847765e8189 fixed thumbnail loader for the new raw preview interface
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1008
diff changeset
542 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
543
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
544 image_loader_emit_error(il);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
545 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
546
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
547 static gboolean image_loader_continue(ImageLoader *il)
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
548 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
549 gint b;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
550 gint c;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
551
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
552 if (!il) return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
553
413
8571030c117a Add two new options to control image read buffer at runtime.
Laurent Monin <geeqie@norz.org>
parents: 281
diff changeset
554 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
555 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
556 {
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
557 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
558
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
559 if (b == 0)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
560 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
561 image_loader_done(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
562 return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
563 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
564
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
565 if (b < 0 || (b > 0 && !il->backend.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
566 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
567 image_loader_error(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
568 return FALSE;
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
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
571 il->bytes_read += b;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
572
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
573 c--;
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
1012
409b52dfe683 converted image loader to a GObject and use signals for notification
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1011
diff changeset
576 if (il->bytes_total > 0)
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
577 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
578 image_loader_emit_percent(il);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
579 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
580
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
581 return TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
582 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
583
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
584 static gboolean image_loader_begin(ImageLoader *il)
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
585 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
586 gssize b;
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
587
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
588 if (il->pixbuf) return FALSE;
442
f698b737556b Big whitespaces cleanup:
Laurent Monin <geeqie@norz.org>
parents: 413
diff changeset
589
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
590 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
591 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
592
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
593 image_loader_setup_loader(il);
1901
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
594
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
595 g_assert(il->bytes_read == 0);
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
596 if (il->backend.load) {
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
597 b = il->bytes_total;
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
598 if (!il->backend.load(il->loader, il->mapped_file, b, &il->error))
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
599 {
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
600 image_loader_stop_loader(il);
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
601 return FALSE;
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
602 }
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
603 }
d21859e612de added custom jpeg loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1900
diff changeset
604 else if (!il->backend.write(il->loader, il->mapped_file, b, &il->error))
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
605 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
606 image_loader_stop_loader(il);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
607 return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
608 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
609
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
610 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
611
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
612 /* read until size is known */
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
613 while (il->loader && !il->backend.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
614 {
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
615 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read);
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
616 if (b < 0 || (b > 0 && !il->backend.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
617 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
618 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
619 return FALSE;
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 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
622 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
623 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
624
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
625 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
626 {
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
627 /* 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
628 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
629
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
630 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
631
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
632 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
633 return TRUE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
634 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
635
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
636 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
637 {
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
638 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
639 return FALSE;
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
640 }
15ab9630b61a Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
John Ellis <johne@verizon.net>
parents: 54
diff changeset
641
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
642 return TRUE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
643 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
644
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
645 /**************************************************************************************/
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
646 /* 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
647
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
648
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
649 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
650 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
651 struct stat st;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
652 gchar *pathl;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
653
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
654 if (!il || il->loader || il->mapped_file) return FALSE;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
655
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
656 il->mapped_file = NULL;
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 if (il->fd)
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
659 {
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
660 ExifData *exif = exif_read_fd(il->fd);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
661
1060
54806f8e4af5 added option to use exif thumbnails
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1055
diff changeset
662 if (options->thumbnails.use_exif)
1559
a207eb3b00ce Fix up few warnings (especially on 64bits platforms).
Laurent Monin <geeqie@norz.org>
parents: 1524
diff changeset
663 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
664 else
1559
a207eb3b00ce Fix up few warnings (especially on 64bits platforms).
Laurent Monin <geeqie@norz.org>
parents: 1524
diff changeset
665 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
666
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
667 if (il->mapped_file)
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
668 {
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
669 il->preview = TRUE;
1060
54806f8e4af5 added option to use exif thumbnails
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1055
diff changeset
670 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
671 }
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
672 exif_free_fd(il->fd, exif);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
673 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
674
1008
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 if (!il->mapped_file)
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 /* normal file */
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
679 gint load_fd;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
680
1009
5847765e8189 fixed thumbnail loader for the new raw preview interface
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1008
diff changeset
681 pathl = path_from_utf8(il->fd->path);
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
682 load_fd = open(pathl, O_RDONLY | O_NONBLOCK);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
683 g_free(pathl);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
684 if (load_fd == -1) return FALSE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
685
1008
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
686 if (fstat(load_fd, &st) == 0)
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
687 {
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
688 il->bytes_total = st.st_size;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
689 }
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
690 else
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
691 {
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
692 close(load_fd);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
693 return FALSE;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
694 }
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
695
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
696 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
697 close(load_fd);
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
698 if (il->mapped_file == MAP_FAILED)
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
699 {
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
700 il->mapped_file = 0;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
701 return FALSE;
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
702 }
2c38f14a2227 use mmaped files image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1000
diff changeset
703 il->preview = FALSE;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
704 }
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
705
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
706 return TRUE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
707 }
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 static void image_loader_stop_source(ImageLoader *il)
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 if (!il) return;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
712
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
713 if (il->mapped_file)
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->preview)
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
716 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
717 exif_free_preview(il->mapped_file);
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 else
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
720 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
721 munmap(il->mapped_file, il->bytes_total);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
722 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
723 il->mapped_file = NULL;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
724 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
725 }
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
726
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
727 static void image_loader_stop(ImageLoader *il)
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
728 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
729 if (!il) return;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
730
1523
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
731 if (il->idle_id)
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
732 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
733 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
734 il->idle_id = 0;
1014
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
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
737 if (il->thread)
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
738 {
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
739 /* stop loader in the other thread */
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
740 g_mutex_lock(il->data_mutex);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
741 il->stopping = TRUE;
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
742 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
743 g_mutex_unlock(il->data_mutex);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
744 }
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
745
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
746 image_loader_stop_loader(il);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
747 image_loader_stop_source(il);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
748
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
749 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
750
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
751 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
752 {
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
753 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
754 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
755 if (!enable)
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
756 {
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
757 /* send delayed */
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
758 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
759 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
760 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
761 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
762
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
763 work = list;
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
764
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
765 while (work)
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 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
768 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
769
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
770 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
771 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
772 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
773 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
774 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
775 else
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
776 {
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
777 /* just unlock */
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
778 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
779 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
780 }
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
781
19bc806e0a69 added possibility to redraw only the parts of image that are already
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1043
diff changeset
782
1014
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 /* execution via idle calls */
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
785
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
786 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
787 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
788 gboolean ret = FALSE;
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
789 ImageLoader *il = data;
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
790
1523
e52aabe8fc7a Fix up event source ids type: gint -> guint.
Laurent Monin <geeqie@norz.org>
parents: 1512
diff changeset
791 if (il->idle_id)
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
792 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
793 ret = image_loader_continue(il);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
794 }
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
795
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
796 if (!ret)
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
797 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
798 image_loader_stop_source(il);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
799 }
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
800
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
801 return ret;
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
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
804
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
805 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
806 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
807 gboolean ret;
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
808
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
809 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
810
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
811 if (!il->fd) return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
812
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
813 if (!image_loader_setup_source(il)) return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
814
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
815 ret = image_loader_begin(il);
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
816
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
817 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
818 return ret;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
819 }
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
820
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
821 /**************************************************************************************/
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
822 /* 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
823
f88d2282b15a Disable unused functions when compiled without threads support, prevents few warnings.
Laurent Monin <geeqie@norz.org>
parents: 1523
diff changeset
824 #ifdef HAVE_GTHREAD
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
825 static GThreadPool *image_loader_thread_pool = NULL;
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
826
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
827 static GCond *image_loader_prio_cond = NULL;
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
828 static GMutex *image_loader_prio_mutex = NULL;
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
829 static gint image_loader_prio_num = 0;
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
830
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
831
1184
4502424815e5 Fix up not a prototype warning.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
832 static void image_loader_thread_enter_high(void)
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
833 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
834 g_mutex_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
835 image_loader_prio_num++;
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
836 g_mutex_unlock(image_loader_prio_mutex);
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
1184
4502424815e5 Fix up not a prototype warning.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
839 static void image_loader_thread_leave_high(void)
1036
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_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
842 image_loader_prio_num--;
1438
a45ba50f0f80 fixed possible deadlock with multiple thumb loaders in parallel
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1433
diff changeset
843 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
844 g_mutex_unlock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
845 }
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
846
1184
4502424815e5 Fix up not a prototype warning.
Laurent Monin <geeqie@norz.org>
parents: 1060
diff changeset
847 static void image_loader_thread_wait_high(void)
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
848 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
849 g_mutex_lock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
850 while (image_loader_prio_num)
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
851 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
852 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
853 }
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
854
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
855 g_mutex_unlock(image_loader_prio_mutex);
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
856 }
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
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
859 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
860 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
861 ImageLoader *il = data;
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
862 gboolean cont;
1756
0e92370a4183 fixed emitting of error signal from image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1722
diff changeset
863 gboolean err;
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
864
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
865 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
866 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
867 /* low prio, wait untill high prio tasks finishes */
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
868 image_loader_thread_wait_high();
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
869 }
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
870 else
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
871 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
872 /* high prio */
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
873 image_loader_thread_enter_high();
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
874 }
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
875
1756
0e92370a4183 fixed emitting of error signal from image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1722
diff changeset
876 err = !image_loader_begin(il);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
877
1756
0e92370a4183 fixed emitting of error signal from image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1722
diff changeset
878 if (err)
1026
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
879 {
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
880 /*
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
881 loader failed, we have to send signal
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
882 (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
883 (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
884 */
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
885 image_loader_emit_error(il);
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
886 }
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
887
1756
0e92370a4183 fixed emitting of error signal from image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1722
diff changeset
888 cont = !err;
0e92370a4183 fixed emitting of error signal from image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1722
diff changeset
889
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
890 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
891 {
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
892 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
893 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
894 /* low prio, wait untill high prio tasks finishes */
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
895 image_loader_thread_wait_high();
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
896 }
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
897 cont = image_loader_continue(il);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
898 }
1020
799621e50c6c improved thread support in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1016
diff changeset
899 image_loader_stop_loader(il);
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
900
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
901 if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE)
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
902 {
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
903 /* high prio */
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
904 image_loader_thread_leave_high();
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
905 }
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
906
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
907 g_mutex_lock(il->data_mutex);
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
908 il->can_destroy = TRUE;
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
909 g_cond_signal(il->can_destroy_cond);
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
910 g_mutex_unlock(il->data_mutex);
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
911
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
912 }
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
913
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
914
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
915 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
916 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
917 if (!il) return FALSE;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
918
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
919 if (!il->fd) return FALSE;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
920
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
921 il->thread = TRUE;
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
922
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
923 if (!image_loader_setup_source(il)) return FALSE;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
924
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
925 if (!image_loader_thread_pool)
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
926 {
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
927 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
928 image_loader_prio_cond = g_cond_new();
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
929 image_loader_prio_mutex = g_mutex_new();
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
930 }
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
931
1026
9b1fc7fb3b58 fixed error handling in image loader
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1021
diff changeset
932 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
933
1021
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
934 g_thread_pool_push(image_loader_thread_pool, il, NULL);
7f69f43a40b5 use GThreadPool
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1020
diff changeset
935 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
936
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
937 return TRUE;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
938 }
1524
f88d2282b15a Disable unused functions when compiled without threads support, prevents few warnings.
Laurent Monin <geeqie@norz.org>
parents: 1523
diff changeset
939 #endif /* HAVE_GTHREAD */
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
940
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
941
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
942 /**************************************************************************************/
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
943 /* public interface */
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
944
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
945
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
946 gboolean image_loader_start(ImageLoader *il)
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
947 {
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
948 if (!il) return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
949
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
950 if (!il->fd) return FALSE;
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
951
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
952 #ifdef HAVE_GTHREAD
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
953 return image_loader_start_thread(il);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
954 #else
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
955 return image_loader_start_idle(il);
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
956 #endif
9
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
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 /* 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
961 GdkPixbuf *image_loader_get_pixbuf(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
962 {
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
963 GdkPixbuf *ret;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
964 if (!il) return NULL;
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
965
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
966 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
967 ret = il->pixbuf;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
968 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
969 return ret;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
970 }
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 gchar *image_loader_get_format(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
973 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
974 gchar **mimev;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
975 gchar *mime;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
976
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
977 if (!il || !il->loader) return NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
978
1900
6e146fa6ec29 infrastructure for image loader backend
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1888
diff changeset
979 mimev = il->backend.get_format_mime_types(il->loader);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
980 if (!mimev) return NULL;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
981
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
982 /* 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
983 mime = g_strdup(mimev[0]);
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
984 g_strfreev(mimev);
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
985
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
986 return mime;
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
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
989 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
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);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
994 il->requested_width = width;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
995 il->requested_height = height;
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
996 g_mutex_unlock(il->data_mutex);
9
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
413
8571030c117a Add two new options to control image read buffer at runtime.
Laurent Monin <geeqie@norz.org>
parents: 281
diff changeset
999 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
1000 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1001 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1002
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1003 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
1004 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
1005 g_mutex_unlock(il->data_mutex);
9
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
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1008 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
1009 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1010 if (!il) return;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1011
1036
e796b3d7cd87 load thumbnails with lower priority
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1026
diff changeset
1012 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
1013 il->idle_priority = priority;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1014 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1015
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1016
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1017 gdouble image_loader_get_percent(ImageLoader *il)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1018 {
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1019 gdouble ret;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1020 if (!il) return 0.0;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1021
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1022 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1023 if (il->bytes_total == 0)
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1024 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1025 ret = 0.0;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1026 }
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1027 else
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1028 {
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1029 ret = (gdouble)il->bytes_read / il->bytes_total;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1030 }
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1031 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1032 return ret;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1033 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1034
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
1035 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
1036 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
1037 gboolean ret;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1038 if (!il) return FALSE;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1039
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1040 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1041 ret = il->done;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1042 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1043
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1044 return ret;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1045 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1046
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1047 FileData *image_loader_get_fd(ImageLoader *il)
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1048 {
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1049 FileData *ret;
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1050 if (!il) return NULL;
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1051
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1052 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1053 ret = il->fd;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1054 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1055
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1056 return ret;
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1057 }
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1058
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
1059 gboolean image_loader_get_shrunk(ImageLoader *il)
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1060 {
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
1061 gboolean ret;
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1062 if (!il) return FALSE;
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1063
1015
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1064 g_mutex_lock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1065 ret = il->shrunk;
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1066 g_mutex_unlock(il->data_mutex);
8ae2996ac904 run image loader in separate thread
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1014
diff changeset
1067 return ret;
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1068 }
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1069
1497
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1070 const gchar *image_loader_get_error(ImageLoader *il)
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1071 {
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1072 const gchar *ret = NULL;
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1073 if (!il) return NULL;
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1074 g_mutex_lock(il->data_mutex);
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1075 if (il->error) ret = il->error->message;
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1076 g_mutex_unlock(il->data_mutex);
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1077 return ret;
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1078 }
6b7c3b1ba708 report pixbuf loader errors
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1438
diff changeset
1079
1011
66037ee8b4d6 do not access image_loader directly
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1009
diff changeset
1080
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
1081 /* 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
1082 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
1083 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1084 ImageLoader *il;
1433
12600de4b59a Use gboolean where applicable, minor cleanup and indentations fixes.
Laurent Monin <geeqie@norz.org>
parents: 1346
diff changeset
1085 gboolean success;
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1086
138
5be5d1c53016 replaced gchar* path with FileData *fd
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 60
diff changeset
1087 il = image_loader_new(fd);
9
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1088
1014
185edecefd2d prepared image loader code for threads
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1012
diff changeset
1089 success = image_loader_start_idle(il);
9
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 if (success && il->pixbuf)
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1092 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1093 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
1094 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
1095 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1096 else
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1097 {
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1098 if (width) *width = -1;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1099 if (height) *height = -1;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1100 }
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1101
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1102 image_loader_free(il);
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1103
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1104 return success;
8d9e9edd6fdf Sync to GQview 1.5.9 release.
John Ellis <johne@verizon.net>
parents:
diff changeset
1105 }
1055
4bbdfab3c89a Adding a vim modeline to all files - patch by Klaus Ethgen
Vladimir Nadvornik <nadvornik@suse.cz>
parents: 1045
diff changeset
1106 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */