add:core: -added possibility to select objects in the command system by filter expressions (Eg: osd[@attr1==1 && (@attr2 != 2 || @attr3 != "strval") ][0]) and optionally indexing the result of filtering

- enabled setting common attributes (x,y,w,h) for OSDs in one place 
- removed osd_set_attr() command system function in favour of the new object selection mechanism


git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4768 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 1 insertions, 17 deletions

diff --git a/navit/osd.c b/navit/osd.c
index 4aed5c2db..8c0e378d3 100644
--- a/navit/osd.c
+++ b/navit/osd.c
@@ -36,8 +36,6 @@ struct osd {
 	struct attr** osd_attrs;
 };
 
-static GHashTable *osd_hash = NULL;
-
 struct osd *
 osd_new(struct attr *parent, struct attr **attrs)
 {
@@ -54,15 +52,7 @@ osd_new(struct attr *parent, struct attr **attrs)
         o=g_new0(struct osd, 1);
         o->priv=new(parent->u.navit, &o->meth, attrs);
 
-	attr=attr_search(attrs, NULL, attr_name);
-	if (attr && attr->u.str) {
-		if(NULL == osd_hash) {
-			osd_hash = g_hash_table_new_full(g_str_hash,g_str_equal,g_free,NULL);
-		}
-		g_hash_table_insert(osd_hash, g_strdup(attr->u.str), o);
-	}
-
-	o->osd_attrs = attr_list_dup(attrs);
+		o->osd_attrs = attr_list_dup(attrs);
 
         return o;
 }
@@ -73,12 +63,6 @@ osd_get_attr(struct osd *this_, enum attr_type type, struct attr *attr, struct a
 	return attr_generic_get_attr(this_->osd_attrs, NULL, type, attr, NULL);
 }
 
-struct osd*
-osd_get_osd_by_name(char *name)
-{
-	return g_hash_table_lookup(osd_hash, name);
-}
-
 int
 osd_set_attr(struct osd *osd, struct attr* attr)
 {