X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/c9a36d684a771ffa32aa22b3cb257d6c693eebb8..355bc49a264c582f780710a09338ed30dbeb1475:/src/gui/lbxgui.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 8321850..2c1235a 100644
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -37,7 +37,7 @@ static GtkBuilder *builder;
 static GtkWidget *canvas;
 static GdkGC     *bg_gc;
 
-static LBX_IMG *image;
+static LBXimg *image;
 
 static GdkPixbuf *framebuf;
 
@@ -83,7 +83,7 @@ static void tick(void *p, double delta)
 	struct lbx_imginfo info;
 	GtkSpinButton   *spin;
 	GtkToggleButton *play;
-	unsigned frame;
+	unsigned frame, newframe;
 
 	if (!image)
 		return;
@@ -97,20 +97,22 @@ static void tick(void *p, double delta)
 		return;
 
 	elapsed += delta;
+	newframe = frame;
 	while (elapsed > seconds_per_frame) {
 		elapsed -= seconds_per_frame;
 
-		if (++frame >= info.nframes) {
+		if (++newframe >= info.nframes) {
 			if (!info.looping) {
 				gtk_toggle_button_set_active(play, FALSE);
 				break;
 			}
 
-			frame = info.loopstart;
+			newframe = info.loopstart;
 		}
-
-		gtk_spin_button_set_value(spin, frame);
 	}
+
+	if (frame != newframe)
+		gtk_spin_button_set_value(spin, newframe);
 }
 
 static gboolean timeout(gpointer data)
@@ -150,7 +152,7 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
 	return TRUE;
 }
 
-static int alloc_framebuffer(LBX_IMG *image)
+static int alloc_framebuffer(LBXimg *image)
 {
 	struct lbx_imginfo info;
 	GtkSpinButton *spin;
@@ -177,11 +179,10 @@ static int close_image(void *handle)
 	return 0;
 }
 
-static LBX_IMG *
-load_lbx_image(LBX *archive, unsigned index)
+static LBXimg *load_lbx_image(LBX *archive, unsigned index)
 {
 	LBXfile *file;
-	LBX_IMG *image;
+	LBXimg *image;
 
 	file = lbx_file_open(archive, index);
 	g_return_val_if_fail(file, NULL);
@@ -197,7 +198,7 @@ void set_override(GtkComboBox *combo)
 	GtkTreeIter iter;
 	gpointer lbx;
 	guint    index;
-	LBX_IMG *img;
+	LBXimg *img;
 
 	memset(palette_override, 0, sizeof palette_override);
 	if (!gtk_combo_box_get_active_iter(combo, &iter))
@@ -247,7 +248,7 @@ void set_image(GtkComboBox *combo)
 	GtkTreeIter iter;
 	gpointer lbx;
 	guint    index;
-	LBX_IMG *img;
+	LBXimg *img;
 
 	if (image) {
 		lbximg_close(image);
@@ -334,7 +335,7 @@ static int load_archive(const char *path)
 	for (unsigned i = 0; i < nfiles; i++) {
 		struct lbx_statbuf stat;
 
-		lbx_stat(lbx, i, &stat);
+		lbx_file_stat(lbx, i, &stat);
 		gtk_tree_store_append(archives, &iter2, &iter1);
 		gtk_tree_store_set(archives, &iter2,
 			0, stat.name,
@@ -455,7 +456,7 @@ static void init_background(GdkDrawable *drawable)
 
 	bg_gc = gdk_gc_new(canvas->window);
 
-	bitmap = gdk_bitmap_create_from_data(drawable, bg_bits,
+	bitmap = gdk_bitmap_create_from_data(drawable, (gchar *)bg_bits,
 		bg_width, bg_height);
 
 	gdk_gc_set_stipple(bg_gc, bitmap);
@@ -493,7 +494,7 @@ int main(int argc, char **argv)
 	init_interface();
 	gtk_builder_connect_signals(builder, window);
 
-	g_timeout_add(10, timeout, NULL);
+	g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, 10, timeout, NULL, NULL);
 	gtk_widget_show_all(window);
 
 	init_background(canvas->window);