Changeset 2821 for libcaca/trunk/src/cacaplay.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (14 years ago)

Author:

Sam Hocevar

Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:

• libcaca/trunk/src/cacaplay.c (modified) (5 diffs)

libcaca/trunk/src/cacaplay.c

@@ -25 +25 @@
 #endif
 
-#include "cucul.h"
 #include "caca.h"
 
 int main(int argc, char **argv)
 {
-    cucul_canvas_t *cv, *app;
+    caca_canvas_t *cv, *app;
     caca_display_t *dp;
     uint8_t *buf = NULL;
@@ -50 +49 @@
     }
 
-    cv = cucul_create_canvas(0, 0);
-    app = cucul_create_canvas(0, 0);
+    cv = caca_create_canvas(0, 0);
+    app = caca_create_canvas(0, 0);
     if(cv == NULL || app == NULL)
     {
@@ -91 +90 @@
         }
 
-        bytes = cucul_import_memory(app, buf, total, "caca");
+        bytes = caca_import_memory(app, buf, total, "caca");
 
         if(bytes > 0)
@@ -98 +97 @@
             memmove(buf, buf + bytes, total);
 
-            cucul_blit(cv, 0, 0, app, NULL);
+            caca_blit(cv, 0, 0, app, NULL);
             caca_refresh_display(dp);
         }
@@ -117 +116 @@
 
     caca_free_display(dp);
-    cucul_free_canvas(cv);
+    caca_free_canvas(cv);
 
     return 0;