# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1190636284 -10800
# Node ID b063954445cfc3363b03cfb25887f4c557b3985e
# Parent  fe3a1ae77f80f7df1781771233c99a4373c748f6# Parent  13512c99b328ee3aa9af423c02ea7359632769a8
Automated merge with file:/home/ccr/audacious/core

diff -r 13512c99b328 -r b063954445cf Skins/Classic/.depend
diff -r 13512c99b328 -r b063954445cf Skins/Classic/.depend-done
diff -r 13512c99b328 -r b063954445cf Skins/Default/.depend
diff -r 13512c99b328 -r b063954445cf Skins/Default/.depend-done
diff -r 13512c99b328 -r b063954445cf Skins/Ivory/.depend
diff -r 13512c99b328 -r b063954445cf Skins/Ivory/.depend-done
diff -r 13512c99b328 -r b063954445cf Skins/Osmosis/.depend
diff -r 13512c99b328 -r b063954445cf Skins/Osmosis/.depend-done
diff -r 13512c99b328 -r b063954445cf Skins/TinyPlayer/.depend
diff -r 13512c99b328 -r b063954445cf Skins/TinyPlayer/.depend-done
diff -r 13512c99b328 -r b063954445cf pixmaps/.depend
diff -r 13512c99b328 -r b063954445cf pixmaps/.depend-done
diff -r 13512c99b328 -r b063954445cf src/audacious/tuple_compiler.c
--- a/src/audacious/tuple_compiler.c	Sun Sep 23 15:42:43 2007 -0500
+++ b/src/audacious/tuple_compiler.c	Mon Sep 24 15:18:04 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;
diff -r 13512c99b328 -r b063954445cf src/audacious/tuple_compiler.h
--- a/src/audacious/tuple_compiler.h	Sun Sep 23 15:42:43 2007 -0500
+++ b/src/audacious/tuple_compiler.h	Mon Sep 24 15:18:04 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 {