* *: Merge from HEAD

* po/*.po: Update LV version.

Author: descender

libvisual/ChangeLog

@@ -1,3 +1,24 @@
+2006-03-04  Chong Kai Xiong  <[email protected]>
+	
+	* *: Merge from HEAD
+	* po/*.po: Update LV version.
+
+2006-03-03  Dennis Smit  <[email protected]>
+
+	* libvisual/lv_color.c (visual_color_white): Black, White, what is the
+	difference. Biggest doh ever.
+
+2006-02-25  Dennis Smit  <[email protected]>
+
+	* libvisual/lv_video.*, libvisual/lv_gl.*: Don't use a callback
+	system for GL attribs, let the display target work with the lists.
+
+2006-02-19  Chong Kai Xiong  <[email protected]>
+
+	* configure.ac, Makefile.am, libvisual/Makefile.am,
+	libvisual.pc.in, po/Makefile.in.in: Allow parallel installation
+	with LV 0.2.0.
+
 2006-02-17  Dennis Smit  <[email protected]>
 
 	* libvisual/lv_audio.c (visual_audio_normalise_spectrum): Use the

libvisual/config.h.in

@@ -7,14 +7,6 @@
 /* GETTEXT package name */
 #undef GETTEXT_PACKAGE
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT

libvisual/libvisual/lv_actor.c

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_actor.c,v 1.39 2006-01-27 20:18:26 synap Exp $
+ * $Id: lv_actor.c,v 1.39.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as

libvisual/libvisual/lv_color.c

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_color.c,v 1.18 2006-01-22 13:23:37 synap Exp $
+ * $Id: lv_color.c,v 1.18.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -303,7 +303,7 @@ VisColor *visual_color_white ()
 
 	if (white_initialized == FALSE) {
 		visual_object_initialize (VISUAL_OBJECT (&white), FALSE, NULL);
-		visual_color_set (&white, 0, 0, 0);
+		visual_color_set (&white, 255, 255, 255);
 
 		white_initialized = TRUE;
 	}

libvisual/libvisual/lv_gl.c

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_gl.c,v 1.5 2006-01-27 20:18:26 synap Exp $
+ * $Id: lv_gl.c,v 1.5.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -29,59 +29,15 @@
 
 #include "lv_gl.h"
 
-static VisGLCallbacks __lv_gl_callbacks;
-
 /**
  * @defgroup VisGL VisGL
  * @{
  */
-
-int visual_gl_set_callback_attribute_set (VisGLSetAttributeFunc attribute_set)
-{
-	__lv_gl_callbacks.attribute_set = attribute_set;
-
-	return VISUAL_OK;
-}
-
-int visual_gl_set_callback_attribute_get (VisGLGetAttributeFunc attribute_get)
-{
-	__lv_gl_callbacks.attribute_get = attribute_get;
-
-	return VISUAL_OK;
-}
-
-
-int visual_gl_set_attribute (VisGLAttribute attribute, int value)
-{
-	if (__lv_gl_callbacks.attribute_set == NULL)
-		return -VISUAL_ERROR_GL_FUNCTION_NOT_SUPPORTED;
-
-	__lv_gl_callbacks.attribute_set (attribute, value);
-
-	return VISUAL_OK;
-}
-
-int visual_gl_get_attribute (VisGLAttribute attribute, int *value)
-{
-	if (__lv_gl_callbacks.attribute_get == NULL)
-		return -VISUAL_ERROR_GL_FUNCTION_NOT_SUPPORTED;
-
-	__lv_gl_callbacks.attribute_get (attribute, value);
-
-	return VISUAL_OK;
-}
-
-
 void *visual_gl_get_proc_address (char *procname)
 {
 	return NULL;
 }
 
-VisGLCallbacks *visual_gl_get_callbacks ()
-{
-	return &__lv_gl_callbacks;
-}
-
 /**
  * @}
  */

libvisual/libvisual/lv_gl.h

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_gl.h,v 1.5 2006-01-27 20:18:26 synap Exp $
+ * $Id: lv_gl.h,v 1.5.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -56,35 +56,17 @@ typedef enum {
 } VisGLAttribute;
 
 
-typedef struct _VisGLCallbacks VisGLCallbacks;
 typedef struct _VisGLAttributeEntry VisGLAttributeEntry;
 
-typedef int (*VisGLSetAttributeFunc)(VisGLAttribute attribute, int value);
-typedef int (*VisGLGetAttributeFunc)(VisGLAttribute attribute, int *value);
-
-
-struct _VisGLCallbacks {
-	VisGLSetAttributeFunc	attribute_set;
-	VisGLGetAttributeFunc	attribute_get;
-};
-
 struct _VisGLAttributeEntry {
 	VisGLAttribute	attribute;
 	int		value;
 	int		mutated;
 };
 
 /* prototypes */
-int visual_gl_set_callback_attribute_set (VisGLSetAttributeFunc attribute_set);
-int visual_gl_set_callback_attribute_get (VisGLGetAttributeFunc attribute_get);
-
-int visual_gl_set_attribute (VisGLAttribute attribute, int value);
-int visual_gl_get_attribute (VisGLAttribute attribute, int *value);
-
 void *visual_gl_get_proc_address (char *procname);
 
-VisGLCallbacks *visual_gl_get_callbacks (void);
-
 VISUAL_END_DECLS
 
 #endif /* _LV_GL_H */

libvisual/libvisual/lv_log.h

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_log.h,v 1.19 2006-01-22 13:23:37 synap Exp $
+ * $Id: lv_log.h,v 1.19.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -30,6 +30,7 @@
 #include <assert.h>
 
 #include <libvisual/lv_defines.h>
+#include <libvisual/lvconfig.h>
 
 VISUAL_BEGIN_DECLS
 
@@ -208,7 +209,7 @@ static void visual_log (VisLogSeverity severity, const char *fmt, ...)
 	va_list va;
 	char sever_msg[10];
 	VisLogVerboseness v;
-	
+
 	assert (fmt != NULL);
 
 	va_start (va, fmt);

libvisual/libvisual/lv_plugin.c

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_plugin.c,v 1.80 2006-01-26 15:13:37 synap Exp $
+ * $Id: lv_plugin.c,v 1.80.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -717,7 +717,7 @@ VisPluginData *visual_plugin_load (VisPluginRef *ref)
 #else
 	handle = dlopen (ref->file, RTLD_LAZY);
 #endif
-	
+
 	if (handle == NULL) {
 #if defined(VISUAL_OS_WIN32)
 		visual_log (VISUAL_LOG_CRITICAL, "Cannot load plugin: win32 error code: %d", GetLastError ());
@@ -1045,7 +1045,7 @@ const char *visual_plugin_type_get_type (const char *type)
 
 		return typestr;
 	}
-	
+
 	return str;
 }
 

libvisual/libvisual/lv_utils.c

@@ -4,7 +4,7 @@
  *
  * Authors: Dennis Smit <[email protected]>
  *
- * $Id: lv_utils.c,v 1.3 2006-01-22 13:23:37 synap Exp $
+ * $Id: lv_utils.c,v 1.3.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -60,6 +60,9 @@ int visual_utils_is_power_of_2 (int n)
 
 	} while (n > 0);
 
+	/* Couldn't we use this: */
+	/* FIXME: (n & (n -1)) == 0) */
+
 	return TRUE;
 }
 

libvisual/libvisual/lv_video.c

@@ -8,7 +8,7 @@
  *	    Jean-Christophe Hoelt <[email protected]>
  *	    Jaak Randmets <[email protected]>
  *
- * $Id: lv_video.c,v 1.86 2006-02-13 20:54:08 synap Exp $
+ * $Id: lv_video.c,v 1.86.2.1 2006-03-04 12:32:47 descender Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -557,22 +557,6 @@ int visual_video_set_attributes (VisVideo *video, int width, int height, int pit
 	return VISUAL_OK;
 }
 
-int visual_video_gl_pump_options (VisVideoAttributeOptions *vidoptions)
-{
-	int i;
-
-	visual_log_return_val_if_fail (vidoptions != NULL, -VISUAL_ERROR_VIDEO_ATTRIBUTE_OPTIONS_NULL);
-
-	for (i = VISUAL_GL_ATTRIBUTE_NONE; i < VISUAL_GL_ATTRIBUTE_LAST; i++) {
-		if (vidoptions->gl_attributes[i].mutated == TRUE) {
-			visual_gl_set_attribute (vidoptions->gl_attributes[i].attribute,
-					vidoptions->gl_attributes[i].value);
-		}
-	}
-
-	return VISUAL_OK;
-}
-
 int visual_video_get_size (VisVideo *video)
 {
 	visual_log_return_val_if_fail (video != NULL, -VISUAL_ERROR_VIDEO_NULL);