Mercurial > audlegacy
changeset 3802:fe3a1ae77f80 trunk
Automated merge with file:/home/ccr/audacious/core
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 19 Sep 2007 17:48:49 +0300 |
| parents | 701de882bcc2 (diff) 4f99a9e270cf (current diff) |
| children | b063954445cf |
| files | mk/init.mk mk/objective.mk mk/rules.mk.in |
| diffstat | 2 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/tuple_compiler.c Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audacious/tuple_compiler.c Wed Sep 19 17:48:49 2007 +0300 @@ -582,10 +582,9 @@ } break; default: - tmps = NULL; - tmpi = 0; + break; } - + return type; } @@ -608,7 +607,6 @@ while (curr) { const gchar *str = NULL; - switch (curr->opcode) { case OP_RAW: str = curr->text; @@ -643,7 +641,7 @@ break; case OP_EXISTS: - if (mowgli_dictionary_retrieve(tuple->dict, ctx->variables[curr->var[0]]->name)) { + if (tf_get_fieldref(ctx->variables[curr->var[0]], tuple)) { if (!tuple_formatter_eval_do(ctx, curr->children, tuple, res, resmax, reslen)) return FALSE; } @@ -655,7 +653,7 @@ case OP_GT: case OP_GTEQ: var0 = ctx->variables[curr->var[0]]; var1 = ctx->variables[curr->var[1]]; - + type0 = tf_get_var(&tmps0, &tmpi0, var0, tuple); type1 = tf_get_var(&tmps1, &tmpi1, var1, tuple); @@ -752,8 +750,6 @@ assert(ctx != NULL); assert(tuple != NULL); - if (!expr) return NULL; - tuple_formatter_eval_do(ctx, expr, tuple, &res, &resmax, &reslen); return res;
--- a/src/audacious/tuple_compiler.h Wed Sep 19 17:47:30 2007 +0300 +++ b/src/audacious/tuple_compiler.h Wed Sep 19 17:48:49 2007 +0300 @@ -25,10 +25,10 @@ #include "tuple.h" -#define MAX_VAR (4) +#define MAX_VAR (2) #define MAX_STR (256) #define MIN_ALLOC_NODES (8) -#define MIN_ALLOC_BUF (64) +#define MIN_ALLOC_BUF (128) enum {