X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=keymapparser.py;h=7b64ae04af3436979e1e014aa01a2f8f1c037ce1;hp=c7bbce1fbfeadb434ed813f524a6c2488748315e;hb=289b86cebe21ce4afae51f40945af74fc5d5b184;hpb=22061f63b0ae2254d569b3c9f2d28f1add39ab1c

diff --git a/keymapparser.py b/keymapparser.py
index c7bbce1..7b64ae0 100644
--- a/keymapparser.py
+++ b/keymapparser.py
@@ -9,12 +9,14 @@ def readKeymap():
 	enigma.eActionMap.getInstance(p)
 	assert p
 	
-	filename = "keymap.xml"
-	
+	filename1 = "data/keymap.xml"
+	filename2 = "/usr/share/enigma2/keymap.xml"
+		
 	try:
-		source = open(filename)
+		source = open(filename1)
 	except:
-		raise "couldn't open keymap.xml!"
+		source = open(filename2)
+#		raise "couldn't open keymap.xml!"
 	
 	try:
 		dom = xml.dom.minidom.parse(source)
@@ -42,7 +44,7 @@ def readKeymap():
 				
 #				try:
 				flags = sum(map(flag_ascii_to_id, flags))
-				print "-> " + str(flags)
+#				print "-> " + str(flags)
 #				except:
 #					raise str("%s: illegal flags '%s' specificed in context %s, id '%s'" % (filename, flags, context, id))
 				
@@ -65,7 +67,7 @@ def readKeymap():
 					except:
 						raise "key id '" + str(id) + "' is illegal"
 
-				print context + "::" + mapto + " -> " + device + "." + hex(keyid)
+#				print context + "::" + mapto + " -> " + device + "." + hex(keyid)
 				p.bindKey(device, keyid, flags, context, mapto)
 		
 		parseKeys("generic", cmap)