annotate src/slideshow.c @ 1181:475986f8f298

Handle return values better to silent some warnings.
author zas_
date Wed, 26 Nov 2008 20:39:50 +0000
parents 1646720364cf
children f539958d7bd8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 138
diff changeset
2 * Geeqie
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
3 * (C) 2004 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 446
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 196
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
15 #include "collect.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
16 #include "image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
17 #include "slideshow.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 517
diff changeset
18 #include "filedata.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
19
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
20 #include "layout.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
21 #include "layout_image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
22 #include "ui_fileops.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
23
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
24
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
25 static void slideshow_timer_stop(SlideShowData *ss);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
26
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
27
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
28 void slideshow_free(SlideShowData *ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
29 {
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
30 if (!ss) return;
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
31
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
32 slideshow_timer_stop(ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
33
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
34 if (ss->stop_func) ss->stop_func(ss, ss->stop_data);
3
gqview
parents: 1
diff changeset
35
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
36 if (ss->filelist) filelist_free(ss->filelist);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
37 if (ss->cd) collection_unref(ss->cd);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
38 file_data_unref(ss->dir_fd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
39
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
40 g_list_free(ss->list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
41 g_list_free(ss->list_done);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
43 file_data_unref(ss->slide_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
44
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
45 g_free(ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
46 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
47
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
48 static GList *generate_list(SlideShowData *ss)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
49 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
50 GList *list = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
51
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
52 if (ss->from_selection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
53 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
54 list = layout_selection_list_by_index(ss->layout);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
55 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
56 else
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
57 {
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 586
diff changeset
58 guint i;
517
d84f2210a73c 6 for() vs 201 for (): winner is for ().
zas_
parents: 516
diff changeset
59 for (i = 0; i < ss->slide_count; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
60 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
61 list = g_list_prepend(list, GINT_TO_POINTER(i));
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
62 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
63 list = g_list_reverse(list);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
64 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
65
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
66 return list;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
67 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
68
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
69 static GList *generate_random_list(SlideShowData *ss)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
70 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
71 GList *src_list = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
72 GList *list = NULL;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
73 GList *work;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
74
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
75 src_list = generate_list(ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
76
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
77 while (src_list)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
78 {
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 885
diff changeset
79 gint p = (gdouble)rand() / ((gdouble)RAND_MAX + 1.0) * g_list_length(src_list);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
80 work = g_list_nth(src_list, p);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
81 list = g_list_prepend(list, work->data);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
82 src_list = g_list_remove(src_list, work->data);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
83 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
84
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
85 return list;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
86 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
87
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
88 static void slideshow_list_init(SlideShowData *ss, gint start_index)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
89 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
90 if (ss->list_done)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
91 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
92 g_list_free(ss->list_done);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
93 ss->list_done = NULL;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
94 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
95
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
96 if (ss->list) g_list_free(ss->list);
3
gqview
parents: 1
diff changeset
97
326
509b84801d66 Rename slideshow options.
zas_
parents: 318
diff changeset
98 if (options->slideshow.random)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
99 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
100 ss->list = generate_random_list(ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
101 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
102 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
103 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
104 ss->list = generate_list(ss);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
105 if (start_index >= 0)
3
gqview
parents: 1
diff changeset
106 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
107 /* start with specified image by skipping to it */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
108 gint i = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
109
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
110 while (ss->list && i < start_index)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
111 {
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 475
diff changeset
112 ss->list_done = g_list_prepend(ss->list_done, ss->list->data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
113 ss->list = g_list_remove(ss->list, ss->list->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
114 i++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
115 }
3
gqview
parents: 1
diff changeset
116 }
gqview
parents: 1
diff changeset
117 }
gqview
parents: 1
diff changeset
118 }
gqview
parents: 1
diff changeset
119
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
120 gint slideshow_should_continue(SlideShowData *ss)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
121 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
122 FileData *imd_fd;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
123 FileData *dir_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
124
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
125 if (!ss) return FALSE;
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
126
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
127 imd_fd = image_get_fd(ss->imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
128
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
129 if ( ((imd_fd == NULL) != (ss->slide_fd == NULL)) ||
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
130 (imd_fd && ss->slide_fd && imd_fd != ss->slide_fd) ) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
131
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
132 if (ss->filelist) return TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
133
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
134 if (ss->cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
135 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
136 if (g_list_length(ss->cd->list) == ss->slide_count)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
137 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
138 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
139 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
140 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
141
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
142 if (!ss->layout) return FALSE;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
143 dir_fd = ss->layout->dir_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
144
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
145 if (dir_fd && ss->dir_fd && dir_fd == ss->dir_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
146 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
147 if (ss->from_selection && ss->slide_count == layout_selection_count(ss->layout, NULL)) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
148 if (!ss->from_selection && ss->slide_count == layout_list_count(ss->layout, NULL)) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
149 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
150
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
151 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
152 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
153
745
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
154 static gint slideshow_step(SlideShowData *ss, gboolean forward)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
155 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
156 gint row;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
157
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
158 if (!slideshow_should_continue(ss))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
159 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
160 return FALSE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
161 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
162
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
163 if (forward)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
164 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
165 if (!ss->list) return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
166
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
167 row = GPOINTER_TO_INT(ss->list->data);
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 475
diff changeset
168 ss->list_done = g_list_prepend(ss->list_done, ss->list->data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
169 ss->list = g_list_remove(ss->list, ss->list->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
170 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
171 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
172 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
173 if (!ss->list_done || !ss->list_done->next) return TRUE;
3
gqview
parents: 1
diff changeset
174
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
175 ss->list = g_list_prepend(ss->list, ss->list_done->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
176 ss->list_done = g_list_remove(ss->list_done, ss->list_done->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
177 row = GPOINTER_TO_INT(ss->list_done->data);
3
gqview
parents: 1
diff changeset
178 }
gqview
parents: 1
diff changeset
179
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
180 file_data_unref(ss->slide_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
181 ss->slide_fd = NULL;
3
gqview
parents: 1
diff changeset
182
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
183 if (ss->filelist)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
184 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
185 ss->slide_fd = file_data_ref((FileData *)g_list_nth_data(ss->filelist, row));
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 783
diff changeset
186 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
187 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
188 else if (ss->cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
189 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
190 CollectInfo *info;
3
gqview
parents: 1
diff changeset
191
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
192 info = g_list_nth_data(ss->cd->list, row);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
193 ss->slide_fd = file_data_ref(info->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
194
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 783
diff changeset
195 image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd));
3
gqview
parents: 1
diff changeset
196 }
gqview
parents: 1
diff changeset
197 else
gqview
parents: 1
diff changeset
198 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
199 ss->slide_fd = file_data_ref(layout_list_get_fd(ss->layout, row));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
200
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
201 if (ss->from_selection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
202 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 783
diff changeset
203 image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
204 layout_status_update_info(ss->layout, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
205 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
206 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
207 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
208 layout_image_set_index(ss->layout, row);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
209 }
3
gqview
parents: 1
diff changeset
210 }
gqview
parents: 1
diff changeset
211
326
509b84801d66 Rename slideshow options.
zas_
parents: 318
diff changeset
212 if (!ss->list && options->slideshow.repeat)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
213 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
214 slideshow_list_init(ss, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
215 }
3
gqview
parents: 1
diff changeset
216
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
217 if (!ss->list)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
218 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
219 return FALSE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
220 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
221
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
222 /* read ahead */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
223
334
df868b947aa0 Rename image-related options.
zas_
parents: 326
diff changeset
224 if (options->image.enable_read_ahead)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
225 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
226 gint r;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
227 if (forward)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
228 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
229 if (!ss->list) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
230 r = GPOINTER_TO_INT(ss->list->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
231 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
232 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
233 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
234 if (!ss->list_done || !ss->list_done->next) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
235 r = GPOINTER_TO_INT(ss->list_done->next->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
236 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
237
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
238 if (ss->filelist)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
239 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
240 image_prebuffer_set(ss->imd, g_list_nth_data(ss->filelist, r));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
241 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
242 else if (ss->cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
243 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
244 CollectInfo *info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
245 info = g_list_nth_data(ss->cd->list, r);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
246 if (info) image_prebuffer_set(ss->imd, info->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
247 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
248 else if (ss->from_selection)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
249 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
250 image_prebuffer_set(ss->imd, layout_list_get_fd(ss->layout, r));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
251 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
252 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
253
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
254 return TRUE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
255 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
256
3
gqview
parents: 1
diff changeset
257 static gint slideshow_loop_cb(gpointer data)
gqview
parents: 1
diff changeset
258 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
259 SlideShowData *ss = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
260
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
261 if (ss->paused) return TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
262
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
263 if (!slideshow_step(ss, TRUE))
3
gqview
parents: 1
diff changeset
264 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
265 ss->timeout_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
266 slideshow_free(ss);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
267 return FALSE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
268 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
269
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
270 return TRUE;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
271 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
272
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
273 static void slideshow_timer_stop(SlideShowData *ss)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
274 {
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
275 if (ss->timeout_id == -1) return;
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
276
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
277 g_source_remove(ss->timeout_id);
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
278 ss->timeout_id = -1;
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
279 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
280
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
281 static void slideshow_timer_reset(SlideShowData *ss)
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
282 {
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
283 if (options->slideshow.delay < 1) options->slideshow.delay = 1;
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
284
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
285 if (ss->timeout_id != -1) g_source_remove(ss->timeout_id);
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
286 ss->timeout_id = g_timeout_add(options->slideshow.delay * 1000 / SLIDESHOW_SUBSECOND_PRECISION,
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
287 slideshow_loop_cb, ss);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
288 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
289
745
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
290 static void slideshow_move(SlideShowData *ss, gboolean forward)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
291 {
89
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
292 if (!ss) return;
b3149a34d0dd Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
293
745
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
294 if (!slideshow_step(ss, forward))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
295 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
296 slideshow_free(ss);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
297 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
298 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
299
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
300 slideshow_timer_reset(ss);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
301 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
302
745
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
303 void slideshow_next(SlideShowData *ss)
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
304 {
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
305 slideshow_move(ss, TRUE);
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
306 }
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
307
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
308 void slideshow_prev(SlideShowData *ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
309 {
745
41dc324ee014 slideshow_next(), slideshow_prev(): move code to common slideshow_move(), reducing code redundancy.
zas_
parents: 744
diff changeset
310 slideshow_move(ss, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
311 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
312
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
313 static SlideShowData *real_slideshow_start(ImageWindow *imd, LayoutWindow *lw,
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
314 GList *filelist, gint start_point,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
315 CollectionData *cd, CollectInfo *start_info,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
316 void (*stop_func)(SlideShowData *, gpointer), gpointer stop_data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
317 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
318 SlideShowData *ss;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
319 gint start_index = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
320
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
321 if (!filelist && !cd && layout_list_count(lw, NULL) < 1) return NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
322
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
323 ss = g_new0(SlideShowData, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
324
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
325 ss->imd = imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
326
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
327 ss->filelist = filelist;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
328 ss->cd = cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
329 ss->layout = lw;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
330 ss->dir_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
331
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
332 ss->list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
333 ss->list_done = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
334
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
335 ss->from_selection = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
336
119
197b8d2e52ce Thu Nov 30 09:55:42 2006 John Ellis <johne@verizon.net>
gqview
parents: 89
diff changeset
337 ss->stop_func = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
338
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
339 ss->timeout_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
340 ss->paused = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
341
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
342 if (ss->filelist)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
343 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
344 ss->slide_count = g_list_length(ss->filelist);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
345 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
346 else if (ss->cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
347 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
348 collection_ref(ss->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
349 ss->slide_count = g_list_length(ss->cd->list);
326
509b84801d66 Rename slideshow options.
zas_
parents: 318
diff changeset
350 if (!options->slideshow.random && start_info)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
351 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
352 start_index = g_list_index(ss->cd->list, start_info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
353 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
354 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
355 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
356 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
357 /* layout method */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
358
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
359 ss->slide_count = layout_selection_count(ss->layout, NULL);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 745
diff changeset
360 ss->dir_fd = file_data_ref(ss->layout->dir_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
361 if (ss->slide_count < 2)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
362 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
363 ss->slide_count = layout_list_count(ss->layout, NULL);
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 586
diff changeset
364 if (!options->slideshow.random && start_point >= 0 && (guint) start_point < ss->slide_count)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
365 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
366 start_index = start_point;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
367 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
368 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
369 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
370 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
371 ss->from_selection = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
372 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
373 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
374
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
375 slideshow_list_init(ss, start_index);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
376
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
377 ss->slide_fd = file_data_ref(image_get_fd(ss->imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
378 if (slideshow_step(ss, TRUE))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
379 {
744
eb7e0d3206a2 Move code from slideshow_timer_reset() to new slideshow_timer_stop() and simplify calls.
zas_
parents: 736
diff changeset
380 slideshow_timer_reset(ss);
119
197b8d2e52ce Thu Nov 30 09:55:42 2006 John Ellis <johne@verizon.net>
gqview
parents: 89
diff changeset
381
197b8d2e52ce Thu Nov 30 09:55:42 2006 John Ellis <johne@verizon.net>
gqview
parents: 89
diff changeset
382 ss->stop_func = stop_func;
197b8d2e52ce Thu Nov 30 09:55:42 2006 John Ellis <johne@verizon.net>
gqview
parents: 89
diff changeset
383 ss->stop_data = stop_data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
384 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
385 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
386 {
119
197b8d2e52ce Thu Nov 30 09:55:42 2006 John Ellis <johne@verizon.net>
gqview
parents: 89
diff changeset
387 slideshow_free(ss);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
388 ss = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
389 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
390
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
391 return ss;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
392 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
393
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 119
diff changeset
394 SlideShowData *slideshow_start_from_filelist(ImageWindow *imd, GList *list,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
395 void (*stop_func)(SlideShowData *, gpointer), gpointer stop_data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
396 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
397 return real_slideshow_start(imd, NULL, list, -1, NULL, NULL, stop_func, stop_data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
398 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
399
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
400 SlideShowData *slideshow_start_from_collection(ImageWindow *imd, CollectionData *cd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
401 void (*stop_func)(SlideShowData *, gpointer), gpointer stop_data,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
402 CollectInfo *start_info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
403 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
404 return real_slideshow_start(imd, NULL, NULL, -1, cd, start_info, stop_func, stop_data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
405 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
406
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
407 SlideShowData *slideshow_start(ImageWindow *imd, LayoutWindow *lw, gint start_point,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
408 void (*stop_func)(SlideShowData *, gpointer), gpointer stop_data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
409 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
410 return real_slideshow_start(imd, lw, NULL, start_point, NULL, NULL, stop_func, stop_data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
411 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
412
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
413 gint slideshow_paused(SlideShowData *ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
414 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
415 if (!ss) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
416
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
417 return ss->paused;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
418 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
419
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
420 void slideshow_pause_set(SlideShowData *ss, gint paused)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
421 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
422 if (!ss) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
423
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
424 ss->paused = paused;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
425 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
426
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
427 gint slideshow_pause_toggle(SlideShowData *ss)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
428 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
429 slideshow_pause_set(ss, !slideshow_paused(ss));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
430 return slideshow_paused(ss);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 3
diff changeset
431 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1000
diff changeset
432 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */