Mercurial > audlegacy
changeset 3953:de76dbec8e1e
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 16 Nov 2007 05:36:42 +0200 |
| parents | 4f6c614aee5d (diff) 57ff64831bec (current diff) |
| children | 7afbcd87cd65 |
| files | Skins/Classic/.depend Skins/Classic/.depend-done Skins/Default/.depend Skins/Default/.depend-done Skins/Ivory/.depend Skins/Ivory/.depend-done Skins/Osmosis/.depend Skins/Osmosis/.depend-done Skins/TinyPlayer/.depend Skins/TinyPlayer/.depend-done pixmaps/.depend pixmaps/.depend-done po/ChangeLog src/audacious/memorypool.c src/audacious/memorypool.h |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/tuple_compiler.h Fri Nov 16 05:32:56 2007 +0200 +++ b/src/audacious/tuple_compiler.h Fri Nov 16 05:36:42 2007 +0200 @@ -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 */