liblbx: Namespace cleanup.

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

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 9e462e65dd5c7df7eecc021111b267b4f7d9c86f..7eed44f6c825114e6c4bbfe426f256de24fcbd87 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -88,7 +88,7 @@ static void tick(void *p, double delta)
        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"));
 
@@ -160,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);
@@ -187,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;
@@ -211,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();
        }
 }
@@ -235,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);
        }
@@ -251,7 +251,7 @@ void set_image(GtkComboBox *combo)
        LBXimg *img;
 
        if (image) {
-               lbximg_close(image);
+               lbx_img_close(image);
                image = NULL;
        }
 
@@ -267,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);
                }
        }