# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1193211713 -10800
# Node ID 4f6c614aee5d1866aba14588a0903f2bee4be0d0
# Parent  1556939b6c805a92452b223ca30d01c9f3410d67# Parent  74cfd332a56d8e13cc1664e4a9bc3c304c9b4d0e
Automated merge with file:/home/ccr/audacious/core

diff -r 74cfd332a56d -r 4f6c614aee5d src/audacious/tuple_compiler.h
--- a/src/audacious/tuple_compiler.h	Wed Oct 24 06:04:31 2007 +0300
+++ b/src/audacious/tuple_compiler.h	Wed Oct 24 10:41:53 2007 +0300
@@ -58,13 +58,6 @@
  */
 typedef struct {
     gchar *name;
-    gboolean isdeterministic;
-    gchar *(*func)(Tuple *tuple, gchar **argument);
-} TupleEvalFunc;
-
-
-typedef struct {
-    gchar *name;
     gboolean istemp;		/* Scope of variable - TRUE = temporary */
     gint type;			/* Type of variable, see VAR_* */
     gchar *defval;		/* Defined value ${=foo,bar} */
@@ -74,9 +67,16 @@
 } TupleEvalVar;
 
 
+typedef struct {
+    gchar *name;
+    gboolean isdeterministic;
+    gchar *(*func)(Tuple *tuple, TupleEvalVar **argument);
+} TupleEvalFunc;
+
+
 typedef struct _TupleEvalNode {
     gint opcode;		/* operator, see OP_ enums */
-    gint var[TUP_MAX_VARS];	/* tuple / global variable references (perhaps hashes, or just indexes to a list?) */
+    gint var[TUP_MAX_VARS];	/* tuple / global variable references */
     gboolean global[TUP_MAX_VARS];
     gchar *text;		/* raw text, if any (OP_RAW) */
     gint function, expression;	/* for OP_FUNCTION and OP_EXPRESSION */