annotate src/image-load.c @ 1043:5fc64d6252e7

Replaced gtk depreceated code.
author bruclik
date Sun, 07 Sep 2008 23:01:30 +0000
parents ab24c46aa6e4
children 0ab0deb0cfcc
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
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 446
diff changeset
4 * Copyright (C) 2008 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 /**************************************************************************************/
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
27 /* image looader class */
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
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
40 static void image_loader_init (GTypeInstance *instance, gpointer g_class);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
41 static void image_loader_class_init (ImageLoaderClass *class);
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
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
45 GType image_loader_get_type (void)
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 = {
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
51 sizeof (ImageLoaderClass),
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 */
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
57 sizeof (ImageLoader),
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 };
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
62 type = g_type_register_static (G_TYPE_OBJECT, "ImageLoaderType", &info, 0);
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
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
67 static void image_loader_init (GTypeInstance *instance, gpointer g_class)
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
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
99 static void image_loader_class_init (ImageLoaderClass *class)
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
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
158 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
159
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
160 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
161
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
162 while (g_source_remove_by_user_data(il))
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 DEBUG_1("pending signals detected");
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
165 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
166
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
167 while (il->area_param_list)
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 DEBUG_1("pending area_ready signals detected");
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
170 while (g_source_remove_by_user_data(il->area_param_list->data)) {}
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
171 g_free(il->area_param_list->data);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
172 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
173 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
174
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
175 if (il->pixbuf) g_object_unref(il->pixbuf);
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
176
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
177 file_data_unref(il->fd);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
178 #ifdef HAVE_GTHREAD
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
179 g_mutex_free(il->data_mutex);
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
180 g_cond_free(il->can_destroy_cond);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
181 #endif
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
182 }
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
183
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
184 void image_loader_free(ImageLoader *il)
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
185 {
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
186 if (!il) return;
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
187 g_object_unref(G_OBJECT(il));
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
188 }
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
189
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
190
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
191 ImageLoader *image_loader_new(FileData *fd)
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 ImageLoader *il;
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
194
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
195 if (!fd) return NULL;
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
196
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
197 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
198
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
199 il->fd = file_data_ref(fd);
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 return il;
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
202 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
203
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
204 /**************************************************************************************/
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
205 /* 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
206
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
207 typedef struct _ImageLoaderAreaParam ImageLoaderAreaParam;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
208 struct _ImageLoaderAreaParam {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
209 ImageLoader *il;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
210 guint x;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
211 guint y;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
212 guint w;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
213 guint h;
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
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 static gint image_loader_emit_area_ready_cb(gpointer data)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
218 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
219 ImageLoaderAreaParam *par = data;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
220 ImageLoader *il = par->il;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
221 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
222 g_mutex_lock(il->data_mutex);
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
223 il->area_param_list = g_list_remove(il->area_param_list, par);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
224 g_free(par);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
225 g_mutex_unlock(il->data_mutex);
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
226
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
227 return FALSE;
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
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
230 static gint image_loader_emit_done_cb(gpointer data)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
231 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
232 ImageLoader *il = data;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
233 g_signal_emit(il, signals[SIGNAL_DONE], 0);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
234 return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
235 }
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 static gint image_loader_emit_error_cb(gpointer data)
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 ImageLoader *il = data;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
240 g_signal_emit(il, signals[SIGNAL_ERROR], 0);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
241 return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
242 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
243
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
244 static gint image_loader_emit_percent_cb(gpointer data)
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 ImageLoader *il = data;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
247 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
248 return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
249 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
250
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
251 /* 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
252 PERCENT and AREA_READY should be processed ASAP
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
253 */
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
254
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
255 static void image_loader_emit_done(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
256 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
257 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
258 }
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 static void image_loader_emit_error(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
261 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
262 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
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_percent(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(G_PRIORITY_HIGH, image_loader_emit_percent_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_area_ready(ImageLoader *il, guint x, guint y, guint w, guint h)
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 ImageLoaderAreaParam *par = g_new0(ImageLoaderAreaParam, 1);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
273 par->il = il;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
274 par->x = x;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
275 par->y = y;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
276 par->w = w;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
277 par->h = h;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
278
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
279 g_mutex_lock(il->data_mutex);
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
280 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
281 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
282
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
283 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
284 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
285
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
286 /**************************************************************************************/
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
287 /* the following functions may be executed in separate thread */
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
288
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
289 static gint image_loader_get_stopping(ImageLoader *il)
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
290 {
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
291 gint ret;
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
292 if (!il) return FALSE;
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
293
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
294 g_mutex_lock(il->data_mutex);
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
295 ret = il->stopping;
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
296 g_mutex_unlock(il->data_mutex);
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
297
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
298 return ret;
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
299 }
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
300
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
301 static void image_loader_sync_pixbuf(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
302 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
303 GdkPixbuf *pb;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
304
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
305 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
306
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
307 if (!il->loader)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
308 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
309 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
310 return;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
311 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
312
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
313 pb = gdk_pixbuf_loader_get_pixbuf(il->loader);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
314
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
315 if (pb == il->pixbuf)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
316 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
317 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
318 return;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
319 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
320
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
321 if (il->pixbuf) g_object_unref(il->pixbuf);
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
322
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
323 il->pixbuf = pb;
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
324 if (il->pixbuf) g_object_ref(il->pixbuf);
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1036
diff changeset
325
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
326 g_mutex_unlock(il->data_mutex);
9
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
500
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
329 static void image_loader_area_updated_cb(GdkPixbufLoader *loader,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
330 guint x, guint y, guint w, guint h,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
331 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
332 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
333 ImageLoader *il = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
334
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
335 if (!image_loader_get_pixbuf(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
336 {
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
337 image_loader_sync_pixbuf(il);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
338 if (!image_loader_get_pixbuf(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
339 {
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
340 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
341 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
342 }
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
343 image_loader_emit_area_ready(il, x, y, w, h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
344 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
345
500
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
346 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
347 {
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
348 GdkPixbuf *pb;
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
349 guchar *pix;
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
350 size_t h, rs;
961
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
351
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
352 /* 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
353 gchar *format = gdk_pixbuf_format_get_name(gdk_pixbuf_loader_get_format(loader));
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 961
diff changeset
354 if (strcmp(format, "svg") == 0)
961
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
355 {
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
356 g_free(format);
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
357 return;
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
358 }
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
359
3f03282ec40e a workaround for http://bugzilla.gnome.org/show_bug.cgi?id=547669
nadvornik
parents: 890
diff changeset
360 g_free(format);
500
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
361
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
362 pb = gdk_pixbuf_loader_get_pixbuf(loader);
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
363
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
364 h = gdk_pixbuf_get_height(pb);
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
365 rs = gdk_pixbuf_get_rowstride(pb);
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
366 pix = gdk_pixbuf_get_pixels(pb);
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
367
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
368 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
369
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
370 }
01fe7ca55c69 clear the buffer before loading of an image
nadvornik
parents: 495
diff changeset
371
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
372 static void image_loader_size_cb(GdkPixbufLoader *loader,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
373 gint width, gint height, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
374 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
375 ImageLoader *il = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
376 GdkPixbufFormat *format;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
377 gchar **mime_types;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
378 gint scale = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
379 gint n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
380
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
381 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
382 if (il->requested_width < 1 || il->requested_height < 1)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
383 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
384 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
385 return;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
386 }
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
387 g_mutex_unlock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
388
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
389 format = gdk_pixbuf_loader_get_format(loader);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
390 if (!format) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
391
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
392 mime_types = gdk_pixbuf_format_get_mime_types(format);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
393 n = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
394 while (mime_types[n])
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
395 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
396 if (strstr(mime_types[n], "jpeg")) scale = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
397 n++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
398 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
399 g_strfreev(mime_types);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 413
diff changeset
400
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
401 if (!scale) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
402
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
403 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
404
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
405 if (width > il->requested_width || height > il->requested_height)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
406 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
407 gint nw, nh;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
408
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
409 if (((gdouble)il->requested_width / width) < ((gdouble)il->requested_height / height))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
410 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
411 nw = il->requested_width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
412 nh = (gdouble)nw / width * height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
413 if (nh < 1) nh = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
414 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
415 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
416 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
417 nh = il->requested_height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
418 nw = (gdouble)nh / height * width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
419 if (nw < 1) nw = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
420 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 413
diff changeset
421
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
422 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
423 il->shrunk = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
424 }
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
425 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
426
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
427 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
428
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
429 static void image_loader_stop_loader(ImageLoader *il)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
430 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
431 if (!il) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
432
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
433 if (il->loader)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
434 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
435 /* some loaders do not have a pixbuf till close, order is important here */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
436 gdk_pixbuf_loader_close(il->loader, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
437 image_loader_sync_pixbuf(il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
438 g_object_unref(G_OBJECT(il->loader));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
439 il->loader = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
440 }
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
441 g_mutex_lock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
442 il->done = TRUE;
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
443 g_mutex_unlock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
444 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
445
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
446 static void image_loader_setup_loader(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
447 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
448 g_mutex_lock(il->data_mutex);
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
449 il->loader = gdk_pixbuf_loader_new();
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
450
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
451 g_signal_connect(G_OBJECT(il->loader), "area_updated",
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
452 G_CALLBACK(image_loader_area_updated_cb), il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
453 g_signal_connect(G_OBJECT(il->loader), "size_prepared",
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
454 G_CALLBACK(image_loader_size_cb), il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
455 g_signal_connect(G_OBJECT(il->loader), "area_prepared",
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
456 G_CALLBACK(image_loader_area_prepared_cb), il);
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
457 g_mutex_unlock(il->data_mutex);
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
458 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
459
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
460
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
461 static void image_loader_done(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
462 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
463 image_loader_stop_loader(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
464
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
465 image_loader_emit_done(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
466 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
467
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
468 static void image_loader_error(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
469 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
470 image_loader_stop_loader(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
471
1009
dd311dae857a fixed thumbnail loader for the new raw preview interface
nadvornik
parents: 1008
diff changeset
472 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
473
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
474 image_loader_emit_error(il);
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 gint image_loader_continue(ImageLoader *il)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
478 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
479 gint b;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
480 gint c;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
481
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
482 if (!il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
483
413
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 281
diff changeset
484 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
485 while (c > 0 && !image_loader_get_stopping(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
486 {
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
487 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
488
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
489 if (b == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
490 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
491 image_loader_done(il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
492 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
493 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
494
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
495 if (b < 0 || (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL)))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
496 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
497 image_loader_error(il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
498 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
499 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
500
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
501 il->bytes_read += b;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
502
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
503 c--;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
504 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
505
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1011
diff changeset
506 if (il->bytes_total > 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
507 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
508 image_loader_emit_percent(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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
511 return TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
514 static gint image_loader_begin(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
515 {
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
516 gint b;
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
517
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
518 if (il->pixbuf) return FALSE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 413
diff changeset
519
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
520 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
521 if (b < 1) return FALSE;
45
7cfa60beda76 Thu May 26 13:57:19 2005 John Ellis <johne@verizon.net>
gqview
parents: 43
diff changeset
522
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
523 image_loader_setup_loader(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
524
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
525 if (!gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
526 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
527 image_loader_stop_loader(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
528 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
529 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
530
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
531 il->bytes_read += b;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
532
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
533 /* read until size is known */
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
534 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
535 {
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
536 b = MIN(il->read_buffer_size, il->bytes_total - il->bytes_read);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
537 if (b < 0 || (b > 0 && !gdk_pixbuf_loader_write(il->loader, il->mapped_file + il->bytes_read, b, NULL)))
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
538 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
539 image_loader_stop_loader(il);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
540 return FALSE;
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
541 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
542 il->bytes_read += b;
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
543 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
544 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
545
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
546 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
547 {
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
548 /* done, handle (broken) loaders that do not have pixbuf till close */
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
549 image_loader_stop_loader(il);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
550
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
551 if (!il->pixbuf) return FALSE;
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
552
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
553 image_loader_done(il);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
554 return TRUE;
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
555 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
556
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
557 if (!il->pixbuf)
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
558 {
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
559 image_loader_stop_loader(il);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
560 return FALSE;
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
561 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 54
diff changeset
562
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
563 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
564 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
565
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
566 /**************************************************************************************/
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
567 /* the following functions are always executed in the main thread */
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
568
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
569
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
570 static gint image_loader_setup_source(ImageLoader *il)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
571 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
572 struct stat st;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
573 gchar *pathl;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
574
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
575 if (!il || il->loader || il->mapped_file) return FALSE;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
576
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
577 il->mapped_file = NULL;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
578
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
579 if (il->fd)
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
580 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
581 ExifData *exif = exif_read_fd(il->fd);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
582
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
583 il->mapped_file = exif_get_preview(exif, &il->bytes_total);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
584
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
585 if (il->mapped_file)
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
586 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
587 il->preview = TRUE;
1009
dd311dae857a fixed thumbnail loader for the new raw preview interface
nadvornik
parents: 1008
diff changeset
588 DEBUG_1("Raw file %s contains embedded image", il->fd->path);
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
589 }
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
590 exif_free_fd(il->fd, exif);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
591 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
592
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
593
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
594 if (!il->mapped_file)
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
595 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
596 /* normal file */
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
597 gint load_fd;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
598
1009
dd311dae857a fixed thumbnail loader for the new raw preview interface
nadvornik
parents: 1008
diff changeset
599 pathl = path_from_utf8(il->fd->path);
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
600 load_fd = open(pathl, O_RDONLY | O_NONBLOCK);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
601 g_free(pathl);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
602 if (load_fd == -1) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
603
1008
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
604 if (fstat(load_fd, &st) == 0)
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
605 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
606 il->bytes_total = st.st_size;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
607 }
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
608 else
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
609 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
610 close(load_fd);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
611 return FALSE;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
612 }
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
613
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
614 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
615 close(load_fd);
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
616 if (il->mapped_file == MAP_FAILED)
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
617 {
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
618 il->mapped_file = 0;
68b0cb6ca8f0 use mmaped files image loader
nadvornik
parents: 1000
diff changeset
619 return FALSE;
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 = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
622 }
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
623
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
624 return TRUE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
625 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
626
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
627 static void image_loader_stop_source(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
628 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
629 if (!il) return;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
630
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
631 if (il->mapped_file)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
632 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
633 if (il->preview)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
634 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
635 exif_free_preview(il->mapped_file);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
636 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
637 else
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
638 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
639 munmap(il->mapped_file, il->bytes_total);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
640 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
641 il->mapped_file = NULL;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
642 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
643 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
644
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
645 static void image_loader_stop(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
646 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
647 if (!il) return;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
648
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
649 if (il->idle_id != -1)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
650 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
651 g_source_remove(il->idle_id);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
652 il->idle_id = -1;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
653 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
654
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
655 if (il->thread)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
656 {
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
657 /* stop loader in the other thread */
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
658 g_mutex_lock(il->data_mutex);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
659 il->stopping = TRUE;
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
660 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
661 g_mutex_unlock(il->data_mutex);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
662 }
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
663
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
664 image_loader_stop_loader(il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
665 image_loader_stop_source(il);
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 }
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 /**************************************************************************************/
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
670 /* execution via idle calls */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
671
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
672 static gint image_loader_idle_cb(gpointer data)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
673 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
674 gint ret = FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
675 ImageLoader *il = data;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
676 if (il->idle_id != -1)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
677 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
678 ret = image_loader_continue(il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
679 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
680 if (!ret)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
681 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
682 image_loader_stop_source(il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
683 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
684 return ret;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
685 }
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
686
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 gint image_loader_start_idle(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
689 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
690 gint ret;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
691 if (!il) return FALSE;
14
25335c62cd9b ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
692
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
693 if (!il->fd) return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
694
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
695 if (!image_loader_setup_source(il)) return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
696
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
697 ret = image_loader_begin(il);
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
698
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
699 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
700 return ret;
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
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
703 /**************************************************************************************/
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
704 /* execution via thread */
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
705 static GThreadPool *image_loader_thread_pool = NULL;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
706
1036
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
707 static GCond *image_loader_prio_cond = NULL;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
708 static GMutex *image_loader_prio_mutex = NULL;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
709 static gint image_loader_prio_num = 0;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
710
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
711
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
712 static void image_loader_thread_enter_high()
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
713 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
714 g_mutex_lock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
715 image_loader_prio_num++;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
716 g_mutex_unlock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
717 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
718
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
719 static void image_loader_thread_leave_high()
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
720 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
721 g_mutex_lock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
722 image_loader_prio_num--;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
723 if (image_loader_prio_num == 0) g_cond_signal(image_loader_prio_cond);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
724 g_mutex_unlock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
725 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
726
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
727 static void image_loader_thread_wait_high()
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
728 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
729 g_mutex_lock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
730 while (image_loader_prio_num)
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
731 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
732 g_cond_wait(image_loader_prio_cond, image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
733 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
734
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
735 g_mutex_unlock(image_loader_prio_mutex);
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
736 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
737
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
738
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
739 void image_loader_thread_run(gpointer data, gpointer user_data)
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
740 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
741 ImageLoader *il = data;
1036
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
742 gint cont;
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
743
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
744 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
745 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
746 /* low prio, wait untill high prio tasks finishes */
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
747 image_loader_thread_wait_high();
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
748 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
749 else
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
750 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
751 /* high prio */
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
752 image_loader_thread_enter_high();
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
753 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
754
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
755 cont = image_loader_begin(il);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
756
1026
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
757 if (!cont && !image_loader_get_pixbuf(il))
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
758 {
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
759 /*
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
760 loader failed, we have to send signal
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
761 (idle mode returns the image_loader_begin return value directly)
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
762 (success is always reported indirectly from image_loader_begin)
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
763 */
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
764 image_loader_emit_error(il);
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
765 }
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
766
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
767 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
768 {
1036
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
769 if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE)
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
770 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
771 /* low prio, wait untill high prio tasks finishes */
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
772 image_loader_thread_wait_high();
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
773 }
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
774 cont = image_loader_continue(il);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
775 }
1020
2bd19478ba29 improved thread support in image loader
nadvornik
parents: 1016
diff changeset
776 image_loader_stop_loader(il);
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
777
1036
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
778 if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE)
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
779 {
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
780 /* high prio */
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
781 image_loader_thread_leave_high();
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
782 }
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
783
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
784 g_mutex_lock(il->data_mutex);
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
785 il->can_destroy = TRUE;
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
786 g_cond_signal(il->can_destroy_cond);
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
787 g_mutex_unlock(il->data_mutex);
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
788
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
789 }
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
790
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
791
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
792 gint image_loader_start_thread(ImageLoader *il)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
793 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
794 if (!il) return FALSE;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
795
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
796 if (!il->fd) return FALSE;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
797
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
798 il->thread = TRUE;
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
799
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
800 if (!image_loader_setup_source(il)) return FALSE;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
801
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
802 if (!image_loader_thread_pool)
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
803 {
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
804 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
805 image_loader_prio_cond = g_cond_new();
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
806 image_loader_prio_mutex = g_mutex_new();
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
807 }
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
808
1026
8acc100d5527 fixed error handling in image loader
nadvornik
parents: 1021
diff changeset
809 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
810
1021
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
811 g_thread_pool_push(image_loader_thread_pool, il, NULL);
988995f6b1cf use GThreadPool
nadvornik
parents: 1020
diff changeset
812 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
813
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
814 return TRUE;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
815 }
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
816
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
817
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
818 /**************************************************************************************/
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
819 /* public interface */
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
820
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
821
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
822 gint image_loader_start(ImageLoader *il)
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
823 {
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
824 if (!il) return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
825
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
826 if (!il->fd) return FALSE;
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
827
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
828 #ifdef HAVE_GTHREAD
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
829 return image_loader_start_thread(il);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
830 #else
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
831 return image_loader_start_idle(il);
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
832 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
833 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
834
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
835
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
836 /* 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
837 GdkPixbuf *image_loader_get_pixbuf(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
838 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
839 GdkPixbuf *ret;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
840 if (!il) return NULL;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
841
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
842 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
843 ret = il->pixbuf;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
844 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
845 return ret;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
846 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
847
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
848 gchar *image_loader_get_format(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
849 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
850 GdkPixbufFormat *format;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
851 gchar **mimev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
852 gchar *mime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
853
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
854 if (!il || !il->loader) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
855
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
856 format = gdk_pixbuf_loader_get_format(il->loader);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
857 if (!format) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
858
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
859 mimev = gdk_pixbuf_format_get_mime_types(format);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
860 if (!mimev) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
861
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
862 /* 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
863 mime = g_strdup(mimev[0]);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
864 g_strfreev(mimev);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
865
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
866 return mime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
867 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
868
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
869 void image_loader_set_requested_size(ImageLoader *il, gint width, gint height)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
870 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
871 if (!il) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
872
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
873 g_mutex_lock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
874 il->requested_width = width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
875 il->requested_height = height;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
876 g_mutex_unlock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
877 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
878
413
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 281
diff changeset
879 void image_loader_set_buffer_size(ImageLoader *il, guint count)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
880 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
881 if (!il) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
882
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
883 g_mutex_lock(il->data_mutex);
413
9e521adbf312 Add two new options to control image read buffer at runtime.
zas_
parents: 281
diff changeset
884 il->idle_read_loop_count = count ? count : 1;
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
885 g_mutex_unlock(il->data_mutex);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
886 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
887
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
888 void image_loader_set_priority(ImageLoader *il, gint priority)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
889 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
890 if (!il) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
891
1036
ab24c46aa6e4 load thumbnails with lower priority
nadvornik
parents: 1026
diff changeset
892 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
893 il->idle_priority = priority;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
894 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
895
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
896
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
897 gdouble image_loader_get_percent(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
898 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
899 gdouble ret;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
900 if (!il) return 0.0;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
901
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
902 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
903 if (il->bytes_total == 0)
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
904 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
905 ret = 0.0;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
906 }
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
907 else
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
908 {
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
909 ret = (gdouble)il->bytes_read / il->bytes_total;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
910 }
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
911 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
912 return ret;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
913 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
914
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
915 gint image_loader_get_is_done(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
916 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
917 gint ret;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
918 if (!il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
919
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
920 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
921 ret = il->done;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
922 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
923
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
924 return ret;
9
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
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
927 FileData *image_loader_get_fd(ImageLoader *il)
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
928 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
929 FileData *ret;
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
930 if (!il) return NULL;
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
931
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
932 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
933 ret = il->fd;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
934 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
935
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
936 return ret;
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
937 }
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
938
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
939 gint image_loader_get_shrunk(ImageLoader *il)
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
940 {
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
941 gint ret;
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
942 if (!il) return FALSE;
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
943
1015
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
944 g_mutex_lock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
945 ret = il->shrunk;
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
946 g_mutex_unlock(il->data_mutex);
2cdcf67e9300 run image loader in separate thread
nadvornik
parents: 1014
diff changeset
947 return ret;
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
948 }
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
949
616b14da08c2 do not access image_loader directly
nadvornik
parents: 1009
diff changeset
950
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
951 /* FIXME - this can be rather slow and blocks until the size is known */
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 60
diff changeset
952 gint image_load_dimensions(FileData *fd, gint *width, gint *height)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
953 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
954 ImageLoader *il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
955 gint success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
956
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 60
diff changeset
957 il = image_loader_new(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
958
1014
4d3c98219246 prepared image loader code for threads
nadvornik
parents: 1012
diff changeset
959 success = image_loader_start_idle(il);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
960
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
961 if (success && il->pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
962 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
963 if (width) *width = gdk_pixbuf_get_width(il->pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
964 if (height) *height = gdk_pixbuf_get_height(il->pixbuf);;
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
967 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
968 if (width) *width = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
969 if (height) *height = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
970 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
971
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
972 image_loader_free(il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
973
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
974 return success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
975 }