Change scale to four, since the new picture requires it

[cascardo/movie.git] / movie.c

diff --git a/movie.c b/movie.c
index 2b14232..22a9f92 100644 (file)
--- a/movie.c
+++ b/movie.c
@@ -21,8 +21,14 @@
 #define HBORDER 32
 #define VBORDER 8
 
+#define STOP_INTERVAL (2*1000)
+#define FPS (100)
+#define FRAME_INTERVAL (1000/(FPS))
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 #include <cairo.h>
 #include <SDL.h>
 #include <SDL_image.h>
@@ -40,7 +46,10 @@
 TTF_Font *font;
 
 SDL_Rect *points;
+char **names;
+int cur = -1;
 int psize;
+int stop = 0;
 
 void
 ReadPoints (char *filename)
@@ -49,19 +58,25 @@ ReadPoints (char *filename)
   char *buffer;
   char *next;
   size_t len;
+  ssize_t r;
   int i;
   file = fopen (filename, "r");
   fscanf (file, "%d\n", &psize);
   points = malloc (sizeof (SDL_Rect) * psize);
-  if (points == NULL)
+  names = malloc (sizeof (char *) * psize);
+  if (points == NULL || names == NULL)
     abort ();
   buffer = NULL;
   len = 0;
   for (i = 0; i < psize; i++)
   {
-    getline (&buffer, &len, file);
+    r = getline (&buffer, &len, file);
+    buffer[r - 1] = '\0';
     points[i].x = strtol (buffer, &next, 0);
-    points[i].y = strtol (next+1, NULL, 0);
+    points[i].y = strtol (next+1, &next, 0);
+    strtol (next, &next, 0);
+    while (isspace (*next)) next++;
+    names[i] = strdup (next);
   }
   fclose (file);
 }
@@ -70,7 +85,6 @@ SDL_Rect
 GetNextPoint (void)
 {
   static SDL_Rect rect = {0, 0, WIDTH, HEIGHT};
-  static int cur = -1;
   static int inc, err, thre, swap;
   static int x1, y1, x2, y2;
   static int x, y;
@@ -78,6 +92,7 @@ GetNextPoint (void)
   next = (cur + 1) % psize;
   if ((points[next].x == rect.x && points[next].y == rect.y) || cur == -1)
   {
+    stop = 1;
     cur = next;
     next = (cur + 1) % psize;
     err = 0;
@@ -151,7 +166,7 @@ CairoTarget (SDL_Surface *image)
     surface = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_ARGB32,
                                                   WIDTH, HEIGHT, WIDTH * 4);
     ctx = cairo_create (surface);
-    cairo_scale (ctx, 2, 2);
+    cairo_scale (ctx, 4, 4);
   }
   source = CairoFromSDL (image);
   cairo_set_source_surface (ctx, source, 0, 0);
@@ -169,67 +184,73 @@ GetNextImage (SDL_Surface *image)
   SDL_Surface *text;
   SDL_Rect box;
   SDL_Color Yellow = { 255, 255, 0, 0};
-  center = GetNextPoint (), GetNextPoint (), GetNextPoint ();
-  slice = SDL_CreateRGBSurface (SDL_SWSURFACE, WIDTH/2, HEIGHT/2,
+  center = GetNextPoint ();
+  slice = SDL_CreateRGBSurface (SDL_SWSURFACE, WIDTH/4, HEIGHT/4,
                                 32,
                                0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
-  center.x -= (WIDTH/2) / 2;
-  center.y -= (HEIGHT/2) / 2;
-  center.w /= 2;
-  center.h /= 2;
+  center.x -= (WIDTH/2) / 4;
+  center.y -= (HEIGHT/2) / 4;
+  center.w /= 4;
+  center.h /= 4;
   SDL_BlitSurface (image, &center, slice, NULL);
   SDL_UpdateRect (slice, 0, 0, 0, 0);
   scale = CairoTarget (slice);
   SDL_FreeSurface (slice);
-  text = TTF_RenderUTF8_Solid (font, "GNU", Yellow);
-  box.w = text->w + HBORDER;
-  box.h = text->h + VBORDER;
-  box.x = (WIDTH - text->w - HBORDER) / 2;
-  box.y = HEIGHT - (text->h + 32 + VBORDER/2);
-  SDL_FillRect (scale, &box, SDL_MapRGB (scale->format, 0, 0, 0));
-  box.x += HBORDER/2;
-  box.y += VBORDER/2;
-  box.w -= HBORDER;
-  box.h -= VBORDER;
-  SDL_BlitSurface (text, NULL, scale, &box);
+  if (stop)
+  {
+    text = TTF_RenderUTF8_Solid (font, names[cur], Yellow);
+    box.w = text->w + HBORDER;
+    box.h = text->h + VBORDER;
+    box.x = (WIDTH - text->w - HBORDER) / 2;
+    box.y = HEIGHT - (text->h + 32 + VBORDER/2);
+    SDL_FillRect (scale, &box, SDL_MapRGB (scale->format, 0, 0, 0));
+    box.x += HBORDER/2;
+    box.y += VBORDER/2;
+    box.w -= HBORDER;
+    box.h -= VBORDER;
+    SDL_BlitSurface (text, NULL, scale, &box);
+    SDL_FreeSurface (text);
+  }
   SDL_UpdateRect (scale, 0, 0, 0, 0);
-  SDL_FreeSurface (text);
   return scale;
 }
 
-Uint32
-ShowNext (Uint32 interval, void *data)
-{
-  SDL_UserEvent event;
-  event.type = SDL_USEREVENT;
-  event.code = 0;
-  SDL_PushEvent ((SDL_Event *) &event);
-  return 33;
-}
-
 int
 main (int argc, char **argv)
 {
   SDL_Surface *screen;
   SDL_Surface *image;
   SDL_Surface *slice;
-  SDL_Event event;
+  Uint32 now, last;
+  int i;
   ReadPoints ("pro-gnu");
   SDL_Init (SDL_INIT_VIDEO | SDL_INIT_TIMER);
   TTF_Init ();
   font = TTF_OpenFont ("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 48);
   screen = SDL_SetVideoMode (WIDTH, HEIGHT, 32, SDL_HWSURFACE | SDL_DOUBLEBUF);
   image = IMG_Load ("/home/cascardo/fotos/debconf.jpg");
-  SDL_AddTimer (0, ShowNext, NULL);
-  while (SDL_WaitEvent (&event))
+  last = SDL_GetTicks ();
+  while (1)
   {
-    if (event.type == SDL_KEYDOWN)
-      break;
-    else if (event.type == SDL_USEREVENT)
+    now = SDL_GetTicks ();
+    /* skip */
+    while (!stop && now > last + FRAME_INTERVAL)
+    {
+      last += FRAME_INTERVAL;
+      GetNextPoint ();
+    }
+    slice = GetNextImage (image);
+    ShowPoint (screen, slice);
+    SDL_FreeSurface (slice);
+    if (stop)
     {
-      slice = GetNextImage (image);
-      ShowPoint (screen, slice);
-      SDL_FreeSurface (slice);
+      stop = 0;
+      SDL_Delay (STOP_INTERVAL);
+      last = SDL_GetTicks ();
+    }
+    else
+    {
+      SDL_Delay (FRAME_INTERVAL - (now - last));
     }
   }
   SDL_FreeSurface (image);
@@ -237,5 +258,8 @@ main (int argc, char **argv)
   TTF_Quit ();
   SDL_Quit ();
   free (points);
+  for (i = 0; i < psize; i++)
+    free (names[i]);
+  free (names);
   return 0;
 }