Merge branch 'master' into djvu

Conflicts:
	reader.lua
This commit is contained in:
Qingping Hou
2012-03-03 17:08:06 +08:00
9 changed files with 140 additions and 68 deletions

View File

@@ -123,4 +123,8 @@ DJVUReader:inputloop()
--reader_settings:close()
--input.closeAll()
--[[os.execute('test -e /proc/keypad && echo "send '..KEY_HOME..'" > /proc/keypad ')]]
input.closeAll()
--os.execute('test -e /proc/keypad && echo "send '..KEY_HOME..'" > /proc/keypad ')
if optarg["d"] ~= "emu" then
os.execute('echo "send '..KEY_MENU..'" > /proc/keypad;echo "send '..KEY_MENU..'" > /proc/keypad')
end