Changeset 52 for branches/clutter-experiments/page.hh

Timestamp:

02/01/09 22:06:39 (3 years ago)

Author:

mirko

Message:

Added a check target in the makefile to allow emacs flymake-mode.

Started the app class. It now loads the pdf and renders all pages in
low resolution while displaying a progress indicator.

There is little more to do to reach an usable stage. The bigger step
is to link the app class to the animator interface (and to implement
a couple of animators).

The pdfcube::page class now simply renders pages to GdkPixbuf?
removing the dependency from Clutter in the page class.

Files:

• branches/clutter-experiments/page.hh (modified) (9 diffs)

branches/clutter-experiments/page.hh

@@ -7 +7 @@
 #include <glib.h>
 #include <poppler.h>
-#include <clutter/clutter.h>
+//#include <clutter/clutter.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -91 +91 @@
               }
 
-            GdkPixbuf* buffer = NULL;
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+            // GdkPixbuf* low_res_m = NULL;
+            if(!low_res_m)
+              low_res_m = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
@@ -100 +101 @@
                                           ((double)h)/size().second, 
                                           0, 
-                                          buffer);
-            GError* error;
-            if(!low_res_m) low_res_m = clutter_texture_new();
-            clutter_texture_set_from_rgb_data 
-               (CLUTTER_TEXTURE(low_res_m),
-                gdk_pixbuf_get_pixels(buffer),
-                gdk_pixbuf_get_has_alpha(buffer),
-                gdk_pixbuf_get_width(buffer),
-                gdk_pixbuf_get_height(buffer),
-                gdk_pixbuf_get_rowstride(buffer),
-                4, (ClutterTextureFlags)0,
-                &error);
-            g_object_unref(buffer);
+                                          low_res_m);
             break;
           }
@@ -133 +122 @@
                 w = h*aspect;
               }
-            GdkPixbuf* buffer = NULL;
-            buffer = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+            if(!hi_res_m)
+              hi_res_m = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
             poppler_page_render_to_pixbuf(poppler_page_m, 
                                           0,
@@ -142 +131 @@
                                           ((double)h)/size().second, 
                                           0, 
-                                          buffer);
-            GError* error;
+                                          hi_res_m);
+            GError* error = 0;
+            
+            /*
             if(!hi_res_m) hi_res_m = clutter_texture_new();
             clutter_texture_set_from_rgb_data 
@@ -155 +146 @@
                 &error);
             g_object_unref(buffer);
+            */
             break;
           }
@@ -198 +190 @@
      * @brief Returns the desired actor (on NULL if not present).
      */
-    ClutterActor* 
-    actor(rendering_mode mode)
+    GdkPixbuf* 
+    pixbuf(rendering_mode mode)
     {
       switch(mode)
@@ -210 +202 @@
       return NULL;
     }
-
+    
   protected:
 
@@ -227 +219 @@
 
     PopplerPage* poppler_page_m;
-    ClutterActor* low_res_m;
-    ClutterActor* hi_res_m;
+    GdkPixbuf* low_res_m;
+    GdkPixbuf* hi_res_m;
   };