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

annotate src/image-load.c @ 2798:d9764817aad8

Collection preview If the folder containing collection files (usually $HOME/.local/share/geeqie/collections) is opened, the image pane will show a montage of the thumbnails (to a maximum of 20) of the images in the selected collection. Requires ImageMagick. This is a simplistic implementation, and should be improved e.g. Use collect-io.c to parse the collection file Use cached thumbnails instead of re-creating Use Geeqie to create the montage instead of using ImageMagick

author	Colin Clark <colin.clark@cclark.uk>
date	Wed, 18 Jul 2018 10:16:41 +0100
parents	1618f87e1ae8
children	ea4163f0c769

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

Mercurial > hg > forks > geeqie

annotate src/image-load.c @ 2798:d9764817aad8