liblbx: Remove now-redundant fields from lbx_imginfo.

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

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 429e59f42876afbe5dd748289ee1e7c633d81929..ca6edecca16fd7737158ca2e0807d06690ca5026 100644 (file)
--- 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 LBXimg *image;
+static struct lbx_image *image;
 
 static GdkPixbuf *framebuf;
 
@@ -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 >= image->frames) {
                        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,24 +152,22 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
        return TRUE;
 }
 
-static int alloc_framebuffer(LBXimg *image)
+static int alloc_framebuffer(struct lbx_image *image)
 {
-       struct lbx_imginfo info;
        GtkSpinButton *spin;
 
        if (framebuf)
                g_object_unref(framebuf);
 
-       lbximg_getinfo(image, &info);
        framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
-               info.width, info.height);
+               image->width, image->height);
        g_return_val_if_fail(framebuf, -1);
 
        spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin"));
-       gtk_spin_button_set_range(spin, 0, info.nframes-1);
+       gtk_spin_button_set_range(spin, 0, image->frames-1);
        gtk_spin_button_set_value(spin, 0);
 
-       gtk_widget_set_size_request(canvas, info.width, info.height);
+       gtk_widget_set_size_request(canvas, image->width, image->height);
        return 0;
 }
 
@@ -177,15 +177,15 @@ static int close_image(void *handle)
        return 0;
 }
 
-static LBXimg *load_lbx_image(LBX *archive, unsigned index)
+static struct lbx_image *load_lbx_image(struct lbx *archive, unsigned index)
 {
        LBXfile *file;
-       LBXimg *image;
+       struct lbx_image *image;
 
        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;
@@ -196,7 +196,7 @@ void set_override(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBXimg *img;
+       struct lbx_image *img;
 
        memset(palette_override, 0, sizeof palette_override);
        if (!gtk_combo_box_get_active_iter(combo, &iter))
@@ -209,8 +209,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 +233,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);
        }
@@ -246,10 +246,10 @@ void set_image(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBXimg *img;
+       struct lbx_image *img;
 
        if (image) {
-               lbximg_close(image);
+               lbx_img_close(image);
                image = NULL;
        }
 
@@ -265,14 +265,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);
                }
        }
 
@@ -315,7 +315,7 @@ static int load_archive(const char *path)
        gchar *basename;
        GtkTreeIter iter1, iter2;
        unsigned nfiles;
-       LBX *lbx;
+       struct lbx *lbx;
 
        lbx = lbx_fopen(path);
        if (!lbx)
@@ -329,11 +329,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 +491,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);