annotate src/image-load.c @ 1498:5f49f305a6b6

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