liblbx: Kill lbx_numfiles.

[liblbx.git] / src / gui / lbxgui.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 429e59f42876afbe5dd748289ee1e7c633d81929..e230d6f84d862f84a95b28cd17bd4114507c2698 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -63,7 +63,7 @@ void set_frame(GtkSpinButton *spin, gpointer data)
 {
        unsigned frame = gtk_spin_button_get_value_as_int(spin);
 
-       if (image)
+       if (image && framebuf)
                render_to_pixbuf(image, framebuf, frame);
        gdk_window_invalidate_rect(canvas->window, NULL, FALSE);
 }
@@ -83,12 +83,12 @@ static void tick(void *p, double delta)
        struct lbx_imginfo info;
        GtkSpinButton   *spin;
        GtkToggleButton *play;
-       unsigned frame;
+       unsigned frame, newframe;
 
        if (!image)
                return;
 
-       lbximg_getinfo(image, &info);
+       lbx_img_getinfo(image, &info);
        spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin"));
        play = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "playbutton"));
 
@@ -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)
@@ -158,7 +160,7 @@ static int alloc_framebuffer(LBXimg *image)
        if (framebuf)
                g_object_unref(framebuf);
 
-       lbximg_getinfo(image, &info);
+       lbx_img_getinfo(image, &info);
        framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
                info.width, info.height);
        g_return_val_if_fail(framebuf, -1);
@@ -185,7 +187,7 @@ static LBXimg *load_lbx_image(LBX *archive, unsigned index)
        file = lbx_file_open(archive, index);
        g_return_val_if_fail(file, NULL);
 
-       image = lbximg_open(file, &lbx_arch_fops, close_image);
+       image = lbx_img_open(file, &lbx_arch_fops, close_image);
        if (!image)
                lbx_file_close(file);
        return image;
@@ -209,8 +211,8 @@ void set_override(GtkComboBox *combo)
 
        img = load_lbx_image(lbx, index);
        if (img) {
-               lbximg_getpalette(img, palette_override);
-               lbximg_close(img);
+               lbx_img_getpalette(img, palette_override);
+               lbx_img_close(img);
                redraw_image();
        }
 }
@@ -233,7 +235,7 @@ void set_palette(GtkComboBox *combo)
 
        f = lbx_file_open(lbx, index);
        if (f) {
-               if (lbximg_loadpalette(f, &lbx_arch_fops, palette_external))
+               if (lbx_img_loadpalette(f, &lbx_arch_fops, palette_external))
                        memset(palette_external, 0, sizeof palette_external);
                lbx_file_close(f);
        }
@@ -249,7 +251,7 @@ void set_image(GtkComboBox *combo)
        LBXimg *img;
 
        if (image) {
-               lbximg_close(image);
+               lbx_img_close(image);
                image = NULL;
        }
 
@@ -265,14 +267,14 @@ void set_image(GtkComboBox *combo)
 
        img = load_lbx_image(lbx, index);
        if (img) {
-               if (lbximg_getpalette(img, palette_internal) == -1) {
+               if (lbx_img_getpalette(img, palette_internal) == -1) {
                        puts("crap");
-                       lbximg_close(img);
+                       lbx_img_close(img);
                }
 
                if (alloc_framebuffer(img) == -1) {
                        puts("crap");
-                       lbximg_close(img);
+                       lbx_img_close(img);
                }
        }
 
@@ -329,11 +331,10 @@ static int load_archive(const char *path)
                -1);
        g_free(basename);
 
-       nfiles = lbx_numfiles(lbx);
-       for (unsigned i = 0; i < nfiles; i++) {
+       for (unsigned i = 0; i < lbx->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,
@@ -492,7 +493,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);