Author: tom
Date: Thu Jan 29 14:36:51 2009
New Revision: 3988
URL: http://svn.slimdevices.com?rev=3988&root=Jive&view=rev
Log:
Bug: N/A
Description:
Action framework:
- Converted usage of KEYs to actions (except for volume and rew/fwd)
--fixed play and add buttons (scanning still has issues)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3988&root=Jive&r1=3987&r2=3988&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Thu Jan 29 14:36:51 2009
@@ -1767,9 +1767,13 @@
local _actionToActionName = {
["go_home"] = 'home',
["pause"] = 'pause',
+ ["stop"] = 'pause-hold',
["play"] = 'play',
+ ["custom_mix"] = 'play-hold',
["add"] = 'add',
+ ["add_next"] = 'add-hold',
["go"] = 'go',
+ ["go_hold"] = 'go-hold',
}
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua?rev=3988&root=Jive&r1=3987&r2=3988&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua Thu
Jan 29 14:36:51 2009
@@ -32,7 +32,7 @@
["c"] = "pause",
["C"] = "stop",
["a"] = "add",
- ["A"] = "addNext",
+ ["A"] = "add_next",
["\b"] = "back", -- BACKSPACE
["\27"] = "back", -- ESC
["j"] = "back",
@@ -64,6 +64,8 @@
keyActionMappings = {}
keyActionMappings.press = {
[KEY_HOME] = "go_home",
+ [KEY_PLAY] = "play",
+ [KEY_ADD] = "add",
[KEY_BACK] = "back",
[KEY_LEFT] = "back",
[KEY_GO] = "go",
@@ -87,11 +89,13 @@
keyActionMappings.hold = {
[KEY_HOME] = "shutdown",
+ [KEY_PLAY] = "create_mix",
+ [KEY_ADD] = "add_next",
[KEY_BACK] = "disconnect_player",
[KEY_LEFT] = "disconnect_player",
[KEY_GO] = "go_hold", --has no default assignment yet
- [KEY_RIGHT] = "go",
- [KEY_PAUSE] = "pause",
+ [KEY_RIGHT] = "go_hold",
+ [KEY_PAUSE] = "stop",
[KEY_FWD] = "scanner_fwd",
[KEY_REW] = "scanner_rew",
[KEY_VOLUME_UP] = "volume_up",
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
