libvisual: Resurrect examples

configure.ac additions are inspired by commit ae41ec9.

Author: hartwork

libvisual/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to generate a Makefile.in
 
-SUBDIRS = libvisual po
+SUBDIRS = libvisual po examples
 
 PKG_CONFIG_FILE = libvisual-$(LIBVISUAL_VERSION_SUFFIX).pc
 

libvisual/configure.ac

@@ -374,6 +374,28 @@ AC_SUBST(VISUAL_LIBS)
 dnl ******************************
 dnl Arguments to specify certain features.
 dnl ******************************
+AC_ARG_ENABLE([examples],
+            AC_HELP_STRING([--disable-examples],
+                           [Do not build example programs @<:@default=enabled@:>@]),
+           [examples=$enableval],
+           [examples=yes])
+AC_MSG_CHECKING([wheter to build example programs])
+if test x$examples = xyes ; then
+  AC_MSG_RESULT([yes])
+  # Find SDL to build the examples.
+  AC_PATH_TOOL(SDL_CONFIG, [sdl-config])
+  if test x$SDL_CONFIG = x ; then
+       AC_MSG_ERROR([*** sdl-config not found.
+                       If you have installed from binaries, probably you have not
+                       installed SDL development package.
+                       See http://www.libsdl.org])
+  fi
+  # On success, this will set and substitute SDL_CFLAGS and SDL_LIBS
+  AM_PATH_SDL(1.2.0,,AC_MSG_ERROR([*** SDL >= 1.2.0 not installed - please install first]))
+  AC_SUBST([EXAMPLES], ['simplesdl morphsdl'])
+else
+  AC_MSG_RESULT([no])
+fi
 
 dnl ******************************
 dnl Debugging stuff 
@@ -823,6 +845,7 @@ po/Makefile.in
 Makefile
 libvisual.pc
 libvisual/Makefile
+examples/Makefile
 ])
 #
 # For now this are not included in the package

libvisual/examples/Makefile.am

@@ -6,12 +6,12 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/examples -I$(top_builddir)
 
 AM_CFLAGS = $(SDL_CFLAGS) $(VISUAL_CFLAGS)
 
-bin_PROGRAMS = $(EXAMPLES)
+noinst_PROGRAMS = @EXAMPLES@
 
 EXTRA_PROGRAMS = simplesdl morphsdl
 
-simplesdl_LDADD = $(SDL_LIBS) $(VISUAL_LIBS)
-morphsdl_LDADD = $(SDL_LIBS) $(VISUAL_LIBS)
+simplesdl_LDADD = $(SDL_LIBS) ../libvisual/libvisual-@[email protected]
+morphsdl_LDADD = $(SDL_LIBS) ../libvisual/libvisual-@[email protected]
 
 simplesdl_SOURCES = simplesdl.c
 

libvisual/examples/morphsdl.c

@@ -209,7 +209,7 @@ int main (int argc, char *argv[])
 	int morph_to = 0;
 
 	/* Used to list all the plugins */
-	char *name = NULL;
+	const char *name = NULL;
 
 	SDL_Event event;
 
@@ -230,7 +230,7 @@ else
 	have_opengl = 1;
 	/* Show a list of plugins */
 	if (argc < 4) {
-		printf ("usage: %s plug1 plug2 morph (targetdepth)\n", argv[0]);
+		printf ("usage: %s actor1 actor2 morph [targetdepth]\n", argv[0]);
 
 		printf ("\nValid actors:\n");
 		do {
@@ -413,10 +413,7 @@ else
 			(int)frames, (int)(end - begin),
 			(end - begin) == 0 ? (int)frames : (int)(frames / (end - begin)));
 
-	/* Destroy the bin, this will also destroy everything within the bin, if you
-	 * only want to free the bin, use visual_bin_free */
-	visual_bin_destroy (bin);
-	visual_video_free (video);
+	visual_video_free_buffer (video);
 
 	visual_quit ();
 

libvisual/examples/simplesdl.c

@@ -153,8 +153,8 @@ void sdl_size_request (int width, int height)
 
 	if (gl_plug == 0) {
 		free (scrbuf);
-		scrbuf = malloc (video->size);
-		memset (scrbuf, 0, video->size);
+		scrbuf = malloc (visual_video_get_size (video));
+		memset (scrbuf, 0, visual_video_get_size (video));
 
 		visual_video_set_buffer (video, scrbuf);
 	}		
@@ -205,7 +205,7 @@ void sdl_draw_buf ()
 {
 	unsigned char *str = (unsigned char *) screen->pixels;
 
-	memcpy (str, scrbuf, video->size);
+	memcpy (str, scrbuf, visual_video_get_size (video));
 
 	SDL_UpdateRect (screen, 0, 0, screen->w, screen->h);
 }
@@ -324,8 +324,8 @@ int main (int argc, char *argv[])
 		bpp = visual_video_bpp_from_depth (depth);
 
 		/* Now we know the size, allocate the buffer */
-		scrbuf = malloc (video->size);
-		memset (scrbuf, 0, video->size);
+		scrbuf = malloc (visual_video_get_size (video));
+		memset (scrbuf, 0, visual_video_get_size (video));
 
 		/* Link the buffer to the video context */
 		visual_video_set_buffer (video, scrbuf);
@@ -433,10 +433,7 @@ int main (int argc, char *argv[])
 			(int)frames, (int)(end - begin),
 			(end - begin) == 0 ? (int)frames : (int)(frames / (end - begin)));
 
-	/* Destroy the bin, this will also destroy everything within the bin, if you
-	 * only want to free the bin, use visual_bin_free */
-	visual_bin_destroy (bin);
-	visual_video_free (video);
+	visual_video_free_buffer (video);
 
 	visual_quit ();